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

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

Change-Id: Iac3cf3a8d3e240bf23006610d515c1003fdbdbdc