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