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