Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into...

Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp am: b8e3d96d

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



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