[automerger skipped] Merge "Add config config_voice_data_sms_auto_fallback" am: 0a35aae9d6 am: 56efb4fa2b am: 7cc0399bed -s ours
am skip reason: Change-Id I0d9f8cee27d6ca79489c2fc5cc721a6bc461c2be with SHA-1 c96cb5e212 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433920
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42d0a7e04cbf3c3d36fd6f5df73616c4c0783520
This commit is contained in: