[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-1243466f3d904d3d812e413e70d976ef" into sc-v2-dev-plus-aosp am: 81102a32 -s ours am: 38080cc6 -s ours

am skip reason: Merged-In I3be6b3f05c9542404379a07f4fc734e45a75152a with SHA-1 63300ce0 is already in history

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

Change-Id: I28ac92ba7a3e99da29469b24acf63d1c1246cd65