Merge changes from topic "am-84a88f3575594b779e4748d13766b4b1" into...

Merge changes from topic "am-84a88f3575594b779e4748d13766b4b1" into udc-qpr-dev-plus-aosp am: 2cd9be07 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 684492a0 is already in history

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



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