Merge changes from topic "am-846861bf62dc4a95a0f7be83935bb5a1" into...

Merge changes from topic "am-846861bf62dc4a95a0f7be83935bb5a1" into udc-qpr-dev-plus-aosp am: 6b769d73 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad25 is already in history

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



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