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

Merge changes from topic "am-c79927cae2e34e0881228b74ca2505d7" into udc-qpr-dev-plus-aosp am: 61af5fcd

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



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