Merge changes from topic "am-7228dcf99ff04f63a53596cac649aa6c" into...

Merge changes from topic "am-7228dcf99ff04f63a53596cac649aa6c" into udc-qpr-dev-plus-aosp am: 0c9ec5ae

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



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