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

Merge changes from topic "am-c0f93efd0ea2456390405a18d79caf44" into udc-qpr-dev-plus-aosp am: 33c38f48

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



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