Merge changes from topic "am-0280e18f58e5493eb36957cce7121d83" into...

Merge changes from topic "am-0280e18f58e5493eb36957cce7121d83" into udc-qpr-dev-plus-aosp am: d1305abe -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 552ec325 is already in history

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



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