Merge "[automerger skipped] Merge "Removed data and voice RAT from service...
Merge "[automerger skipped] Merge "Removed data and voice RAT from service state" am: ced4a317 am: 279a924f am: f3c6f0e4 -s ours am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1 5ff5ab56 is in history"