[automerger skipped] Merge changes from topic "am-76df8b8d494a4ae0955a5e1399d5d32c" into sc-v2-dev-plus-aosp am: 2b1ab0ac -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: I95db96a3c26e2f26698d126d15f071f507add6e9