Merge changes from topic "am-2966f148736540468351822ad0f01c75" into...

Merge changes from topic "am-2966f148736540468351822ad0f01c75" into udc-qpr-dev-plus-aosp am: 07ac57ae -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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