[automerger skipped] Merge 24Q4 into AOSP main am: 7390b6411c -s ours am skip reason: Merged-In I87a006565caefe7287752fafd2375769949145ed with SHA-1 d3769fedb9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/ImsServiceEntitlement/+/3413957 Change-Id: I16fcb39a9fe0dc54e0c5876f6038b21908119cce Signed-off-by: Automerger Merge Worker <[email protected]>