Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState."
am: 74cdfecc5d

Change-Id: I42a294404ae715f998f3b0db90e79602629ef9dc