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

am skip reason: Merged-In Iea653c38c266308b475689f080fd2342618085cb with SHA-1 0cd14a5f41 is already in history

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

Change-Id: I6154c2889ecf421f3ade139d032e2b632ebaa97a
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: babab8bc9f5a26364244e5a89613da787efceaba
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS