[automerger skipped] Merge "ImsServiceEntitlement default values missing" am: 14c8d5f0a6 am: 6a6b1fa6aa am: 2a1f1df5ed -s ours

am skip reason: Merged-In I98d943394ed308956c5271b8efaa5094d15dc8ca with SHA-1 33c6221c5b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921058

Change-Id: I9846168fb3a10e9fd694963816e634687234922a