[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L09900000960673879:N49200001369201569" into udc-qpr-dev am: 65f2472a am: 582c5660 -s ours

am skip reason: Merged-In If7782804ed7ab1edf9926382e22f307cb644a95e with SHA-1 f7d58ed5 is already in history

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



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