Merge changes from topic "am-1f07f723697e4003a5d0088ea4377498" into udc-qpr-dev-plus-aosp am: 8835c5e7

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



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