Merge changes from topic "am-7d9d2ca23cd14ce8becae551d2f52bb4" into...

Merge changes from topic "am-7d9d2ca23cd14ce8becae551d2f52bb4" into udc-qpr-dev-plus-aosp am: 9f7d77d3

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



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