Merge changes from topic "am-bc8f503672664608a559f23192cb0a26" into...

Merge changes from topic "am-bc8f503672664608a559f23192cb0a26" into udc-qpr-dev-plus-aosp am: 117fe74e -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 684492a0 is already in history

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



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