Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState."