Merge "ImsServiceEntitlement default values missing" am: 14c8d5f0a6

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

Change-Id: Iece121724d392b3b5199d6556e6d7adb4a6c1333