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

Merge changes from topic "am-f755b8c24ad94702890f1d42d43459e9" into udc-qpr-dev-plus-aosp am: 2247db93

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



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