[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 82fee3008f -s ours am: bbbe1f07d9 -s ours

am skip reason: Merged-In I6e36dd381003003cd5b24f409be591e54c5c593b with SHA-1 e06278d1c4 is already in history

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

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