[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-cc5dc0744f944d90ae9d2d284d59e082" into sc-v2-dev-plus-aosp am: 4729cf76 -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: I286f51e2e9ef21fd3f42df083171c44fa27d7650