[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c4af3eefdcdc419fb2f54eacb2b2ac35" into sc-v2-dev-plus-aosp am: 481ebfc6 -s ours

am skip reason: Merged-In Ic2da6e5c12628f11603f51c7a3408aad70947d95 with SHA-1 395e56a7 is already in history

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

Change-Id: I4e6e8cdaede8f845b69f2d87a6ed59877019f538