[automerger skipped] Merge "Removed data and voice RAT from service state" am: ced4a31769 am: 279a924fdf
am:f3c6f0e47c-s ours am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA15ff5ab5649is in history Change-Id: I36c1ffc0680b6a1630eee2349e419cc7a9a25b1d
This commit is contained in: