[automerger skipped] Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am:...

[automerger skipped] Merge "Add KEY_VOICE_OVER_WIFI_ENTITLEMENT_ID" am: 5c8e5ca3 am: f5997ba8 am: aabfda37 am: 1fc9d9db am: bf854624 -s ours

am skip reason: Change-Id I917085cf6f962c7f5cc7088e2e5298597f661514 with SHA-1 6e39f4af is in history

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

Change-Id: Ie132a430a2c80842f9954308221b2535a6a59a03