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



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