[automerger skipped] Merge "notifyUserMobileDataStateChangedForPhoneId does not set mUserMobileDataState." am: 74cdfecc5d am: ffe3ce0ce3 -s ours
am: b0477deaec -s ours
am skip reason: change_id I5db6329ce4699cca8d79a827c36f7f61a4fa8f92 with SHA1 0b109f5f93 is in history

Change-Id: Idb8a050246b14c69549780355965ff231c46ac8a