Merge changes from topic "am-0c32d01cd08f4eacbc6cee4d05aad6f8" into...

Merge changes from topic "am-0c32d01cd08f4eacbc6cee4d05aad6f8" into udc-qpr-dev-plus-aosp am: fdcc01dc -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 12c20150 is already in history

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



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