Merge changes from topic "am-87bc6609ac824e55ab12cde27de16be6" into...

Merge changes from topic "am-87bc6609ac824e55ab12cde27de16be6" into udc-qpr-dev-plus-aosp am: d8c2f483

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



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