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

[automerger skipped] Merge "resolve merge conflicts of b0a08742 to sc-v2-dev" into sc-v2-dev am: 01b398fb am: 85d98a2a -s ours

am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 e8f14f48 is already in history

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

Change-Id: I5f7e940c658bf96d0f67c99268310d53d81e177a