[automerger skipped] DO NOT MERGE - Merge Android 13 am: 817e826b7e -s ours am: 670153546c -s ours

am skip reason: Merged-In I2caaadbca9a1ded7be6bfa48cc3dd2e505e52f01 with SHA-1 436d508b58 is already in history

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

Change-Id: I92055b640dedeb4e38f4469c16d21becf9f7aa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>