[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L76800000958796731:N60400001340845132" into udc-dev am: 83f5395c am: 05d6f695 -s ours

am skip reason: Merged-In Iabd7c7c3ca503c354014e4fe73d449570cf4ceb5 with SHA-1 6e9e524b is already in history

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



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