Bug: 285189512
Test: Flashed build on raven-userdebug and performed basic functionality
tests,
atest NetworkRegistrationInfoTest,
atest ServiceStateTest

Change-Id: Idc106f26209c805cee898e7358574523617a3365
Merged-In: Idc106f26209c805cee898e7358574523617a3365