[automerger skipped] Merge Android U (ab/10368041) am: 80aa121e14 -s ours am: 02e19cea0b -s ours am: 6b7f298931 -s ours

am skip reason: Merged-In I85225e94672841ef4820464410517dfa35492533 with SHA-1 2e3a06d0c5 is already in history

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

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