[automerger skipped] Merge Android 13 QPR1 am: 5c9e30ae44 -s ours am: 0aede3b6b8 -s ours am: 90ce87b1b3 -s ours

am skip reason: Merged-In I43ad6f72d8592c973f1d72328baea175100c6201 with SHA-1 a4954c17a8 is already in history

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

Change-Id: Ic4f37fd52c19fc21781592e2b5e45c4074d3aa32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 6a71a83df020b2f6acffdf56611a6d3dd1f6d00e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS