Merge changes from topic "cherrypicker-L09900000960673879:N49200001369201569"...

Merge changes from topic "cherrypicker-L09900000960673879:N49200001369201569" into udc-qpr-dev am: 65f2472a

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



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