[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-7ecf61029b34426e9547eba0bed885c9" into sc-qpr1-dev am: 51dab8a2 -s ours am: d0a6043e -s ours am: 6b47f68d -s ours

am skip reason: Merged-In Icd15712cd4821b7833a3373978a92f8b5959ac12 with SHA-1 917a11a5 is already in history

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

Change-Id: I14bac368ace024d1c73aa823682210583263907d