c061f0053e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8eb6681328ad1f4a85bcc8c6c4b9446c23616b7a