Merge changes from topic "am-0c0a3c352ed5435682a7bab68b578883" into...

Merge changes from topic "am-0c0a3c352ed5435682a7bab68b578883" into udc-qpr-dev-plus-aosp am: 0f3b8747

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



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