Merge "[automerger skipped] Merge "Merge...

Merge "[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: a6a261b1 -s ours" into sc-v2-dev-plus-aosp am: 22e34be2 -s ours

am skip reason: Merged-In I8cfa435bb6233818adb9cc99dadeeb06a03443d5 with SHA-1 0ca70fff is already in history

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

Change-Id: Ie1202f6636c0b6417c48dee03be3ef3a3ec3faa5