[automerger skipped] Merge "Merge Android 12" am: a5c6b93b9f -s ours

am skip reason: Merged-In Icbad3b6b144a9a58d38289127fed45e3887a26f8 with SHA-1 524001e747 is already in history

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

Change-Id: I249cded1c1bec1b42b72fdc6c74e157da9878cbf