[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 5c966761ef -s ours

am skip reason: Merged-In I1012148cebf8fe5034bb0283c39853e6322233b1 with SHA-1 d53bfc0e17 is already in history

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

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