Merge changes from topic "am-bf8e0c856789421b8232289c306125c9" into udc-qpr-dev-plus-aosp am: 0753fb6e

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



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