Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313 am: f5997ba830 am: aabfda3787

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

Change-Id: If68f0ae7e2ae31d8d098f7b43404a853089bf4cd