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

Merge changes from topic "am-e0f4f1037cd340d38a70239baa83ea88" into udc-qpr-dev-plus-aosp am: 4fc36e4a -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 1c3d701c is already in history

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



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