Merge "ImsServiceEntitlement default values missing" am: 14c8d5f0a6 am: 6a6b1fa6aa

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

Change-Id: Ibb462d762260c71a3ecfa2497b3208314dea4dda