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

Merge changes from topic "am-f92040b0a6cd4190a5540d1193ecbb94" into udc-qpr-dev-plus-aosp am: 718fcb99

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



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