[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev" into sc-v2-dev-plus-aosp am: 5f6aaa66 -s ours

am skip reason: Merged-In I3030c47be9d02a27505bd4775c1982a20755758c with SHA-1 69538cf7 is already in history

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

Change-Id: I864e80ab13701bc66095e6e8a3289b3f1963d6fe