[automerger skipped] Merge Android 12L am: 3955ebf443 -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: Ida9c6f0b79be4d3a95398211fd2fdd522169dbc8
tree: 54dd3ccde06cfffd556d2cdb81149306c2386cf5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS