[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 43c5385e87 -s ours

am skip reason: Merged-In Iaa744f1834b45dff46ac79fb6ce8b6f8cfe883f0 with SHA-1 ed82a9496a is already in history

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

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