Merge changes from topic "am-026fd7be3b4047a5b1222eea0f077cb8" into...

Merge changes from topic "am-026fd7be3b4047a5b1222eea0f077cb8" into udc-qpr-dev-plus-aosp am: 43fe0ba1

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



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