Merge changes from topic "am-4954a5c5336845db92b86dbd178c350a" into...

Merge changes from topic "am-4954a5c5336845db92b86dbd178c350a" into udc-qpr-dev-plus-aosp am: d549f765 -s ours

am skip reason: Merged-In I4ef415437568ae165ac5a3153d18bd2e2ef1f808 with SHA-1 69f9efe5 is already in history

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



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