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

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

Change-Id: Ibac117099202d1fd2589c828270e3f3b09577479