Merge changes from topic "am-4d5ad9f5c54543c584fe151b6e14fcd1" into...

Merge changes from topic "am-4d5ad9f5c54543c584fe151b6e14fcd1" into udc-qpr-dev-plus-aosp am: 86d745ad

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



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