[automerger skipped] Merge "Removed data and voice RAT from service state" am:...
[automerger skipped] Merge "Removed data and voice RAT from service state" am: ced4a317 am: 279a924f -s ours
am: 8f0ba600 -s ours
am skip reason: change_id I3f4cb6057a4ae821363099583eeac7c867147afb with SHA1 138e2af5 is in history
Change-Id: Ic4d680eb6c5aed2e7a6ffef4aec254ca50279e07