Merge changes from topic "am-63f97cd751794181ac5bfb6a6603c1d3" into...

Merge changes from topic "am-63f97cd751794181ac5bfb6a6603c1d3" into tm-qpr-dev-plus-aosp am: 6fc83026 -s ours

am skip reason: Merged-In If4152279970090eeb3ea34307dfade5873e9dbf3 with SHA-1 d2e10c93 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17913998



Change-Id: I246bd9f35023bd2ea7041af0592578c901b910d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>