7fadc9f800
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593776 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26d5ce2f8ce0d7315619ab444146b94eaca29147