[conflict] Merge "Snap tm-dev to android13-tests-dev" into tm-dev am: 531aacf5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/20514287



Relnote: Resolving merge conflict
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug:265050633
Merged-In: Ib0f4898470800c5f9086376d5878ef49e0bc0006
Change-Id: If438d356652cf8ff6b3cb3fb57632180d20c1b38