Merge changes from topic "am-658a20339849469483796e3796f705f0" into...

Merge changes from topic "am-658a20339849469483796e3796f705f0" into udc-qpr-dev-plus-aosp am: 9712a920

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



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