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

Merge changes from topic "am-f284c104facc4c2687b457ff7784d299" into udc-qpr-dev-plus-aosp am: 26515660

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



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