Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master

* changes:
  [automerger skipped] Merge "Merge Android 13 QPR1" am: d6fc8e8209 -s ours
  [automerger skipped] Merge Android 13 QPR1 am: 5c9e30ae44 -s ours
tree: f0308152cf66632eee0ad208d726cbc8b27ae87d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS