Merge changes from topic "am-93eff5d0d6734f60972721f21ddbc265" into...

Merge changes from topic "am-93eff5d0d6734f60972721f21ddbc265" into udc-qpr-dev-plus-aosp am: 62e1d703 -s ours

am skip reason: Merged-In I48c2ce7ff2d7fc067961ea2af0ea63818316f086 with SHA-1 131e73e1 is already in history

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



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