Merge "Consider Service State OFF same as OUT OF SERVICE for combined regState...
Merge "Consider Service State OFF same as OUT OF SERVICE for combined regState am: c594cbe5 am: ce3e7ebc" into oc-dr1-dev-plus-aosp
am: 1477d822
Change-Id: I9d583d4ed106ee7bcae4b1b90e7eff247c51c14a