Merge "Modify ServiceStateProvider for mOperatorAlphaLongRaw and mOperatorAlphaShortRaw"
am: 7769780db7

Change-Id: I81dc23047ed3468360ed7e5e5766dfe107098085