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

Merge changes from topic "am-ea3e8331c1ff42b08be669f2f8c64473" into udc-qpr-dev-plus-aosp am: 1dfa87a8 -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/+/23861195



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