[automerger skipped] Merge changes from topic "presubmit-am-7ecf61029b34426e9547eba0bed885c9" into sc-qpr1-dev am: 51dab8a225 -s ours am: d0a6043e3b -s ours

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

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

Change-Id: Ia902210f882b856e6e74a3b246606a43f6156c4b