Merge changes from topic "am-686b94cbef17426c855faa4d4bc99333" into...

Merge changes from topic "am-686b94cbef17426c855faa4d4bc99333" into udc-qpr-dev-plus-aosp am: 96e12ae8 -s ours

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

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



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