Merge changes from topic "am-61a26e97397f4df0a200cf0515bf3866" into...

Merge changes from topic "am-61a26e97397f4df0a200cf0515bf3866" into udc-qpr-dev-plus-aosp am: 193ab40f

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



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