[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L90400000962489226:N88700001395452092" into udc-qpr-dev am: abc303c3 am: 9819d54e -s ours

am skip reason: Merged-In I5c00b252054cf3736b3f24859a41d3fd894fe1de with SHA-1 938eb098 is already in history

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



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