8819459e4a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic05c10eca12c3c43190c767b4cef6ad88a0835f5