[automerger skipped] Merge 24Q3 to AOSP main am: 7c3625455a -s ours

am skip reason: Merged-In I6c7740ac21ed67d65493dd973649bbd7d12acb01 with SHA-1 3df5484673 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ImsServiceEntitlement/+/3257826

Change-Id: I9a4aeb420f9a55adb111584ed0021de5d9058bb2
Signed-off-by: Automerger Merge Worker <[email protected]>