Merge changes from topic "am-e74a395882ad4454ad7a437efabfae51" into...

Merge changes from topic "am-e74a395882ad4454ad7a437efabfae51" into udc-qpr-dev-plus-aosp am: 47c20e68 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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