[automerger skipped] Merge "Add config config_voice_data_sms_auto_fallback"...

[automerger skipped] Merge "Add config config_voice_data_sms_auto_fallback" am: 0a35aae9 am: 56efb4fa am: 7cc0399b -s ours am: a218e63c -s ours am: 7e868a6a -s ours

am skip reason: Change-Id I0d9f8cee27d6ca79489c2fc5cc721a6bc461c2be with SHA-1 c96cb5e2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c98f3ab5dbda246e4ebff3531c0139f428eb58c