[automerger skipped] Merge "Removed data and voice RAT from service state" am: b7d3cef1d7 am: 5b32dd8802
am: e2aebd89c0 -s ours
am skip reason: change_id If91dc780607f0496f0898a1bbfc372c01706bb9f with SHA1 1e3f06c68a is in history

Change-Id: I89c4fc04e700b6d9323ad4431acbd0e517ad0169