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

am skip reason: Merged-In I8cfa435bb6233818adb9cc99dadeeb06a03443d5 with SHA-1 4c0b80f6f1 is already in history

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

Change-Id: Ie1202f6636c0b6417c48dee03be3ef3a3ec3faa5
tree: 137075191c57e36bbf062d59031fe49ae90bb50d
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/