Merge changes from topic "am-7ae8ae14290849f3bb2ab155541c4ad4" into...

Merge changes from topic "am-7ae8ae14290849f3bb2ab155541c4ad4" into udc-qpr-dev-plus-aosp am: 4fac106b

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



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