[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 89a3f3344b -s ours

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

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

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