51fe7a453a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa585ef4ca529150b02e2d7469f13d8fa5c53682