Merge changes from topic "am-52d491586aa4467699d309767204c643" into...

Merge changes from topic "am-52d491586aa4467699d309767204c643" into udc-qpr-dev-plus-aosp am: 30daa631 -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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