[automerger skipped] Merge "Merge Android 12L" am: dd488b2684 -s ours am: 47ba7a8d41 -s ours am: b2aba6dcde -s ours

am skip reason: Merged-In I1487ce9826e077bdd889c9d1c8fd3e8ea0344dd9 with SHA-1 acb6e110d2 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/2012834

Change-Id: Ieb26831dba193198629b03b4ff528d8cbc828ecd
tree: 4722c277427fbc5d3e1d9a2e2e103af9df98895d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS