Merge changes from topic "am-773fd678345f406e9160eda60699c091" into...

Merge changes from topic "am-773fd678345f406e9160eda60699c091" into udc-qpr-dev-plus-aosp am: 0b51cf95

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



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