Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca313

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

Change-Id: I71c283427686526817b94a549dd9ac861d38acbf