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