Merge changes from topic "am-25f38db0473843d6aaea12f234edead3" into...

Merge changes from topic "am-25f38db0473843d6aaea12f234edead3" into udc-qpr-dev-plus-aosp am: bfc44107 -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/+/25101850



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