[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 7a1d1e02ad -s ours am: 7f63e39882 -s ours

am skip reason: Merged-In I43adbf37b4dc26e5dfecd68143c83cf269bb18aa with SHA-1 207159a9dc is already in history

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

Change-Id: I2e3d12327d9e377f0bbc59d22a78cb2bc5f0ccaf
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: e42b81a1338718916b1cd66a286cf98dedb46162
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS