Merge "Snap tm-dev to android13-tests-dev" into tm-dev am: 531aacf5 am: 0e7215e7

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



Change-Id: I518b0a02c383a5c800971f0dbd2a4b517e084553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>