[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 47951c5a11 -s ours

am skip reason: Merged-In I4d412f11199370a253494cbaec65ecb94fdbe5a4 with SHA-1 1d4d6afcfb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SafetyRegulatoryInfo/+/27553793

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