[automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 99f02e04d0 -s ours am: 57db8f5479 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5a651572d752ef102d40ca730644f9dcbf1ddbe9
tree: 8b733030eec0fae55be19a32f354751769dd0f2b
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/