Merge changes from topic "am-7224ef704ce249108e8a443771871e34" into...

Merge changes from topic "am-7224ef704ce249108e8a443771871e34" into udc-qpr-dev-plus-aosp am: c3997d87

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



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