[automerger skipped] Merge "resolve merge conflicts of...

[automerger skipped] Merge "resolve merge conflicts of c4828692 to sc-v2-dev" into sc-v2-dev am: 10066c69 -s ours am: 6292ca01 -s ours

am skip reason: Merged-In Ied977fec9009265dac89b7e24c1075ceb2905bfd with SHA-1 f2e79595 is already in history

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

Change-Id: I412668ef3845ce6c26fc79b71ddf95f9fee49bbd