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