Merge changes from topic "am-89b16113b04c45418f747c1080d0da5b" into...

Merge changes from topic "am-89b16113b04c45418f747c1080d0da5b" into udc-qpr-dev-plus-aosp am: 6b7d809a

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



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