[automerger skipped] Merge "Fixed data disconnected for 10 seconds when...
[automerger skipped] Merge "Fixed data disconnected for 10 seconds when disabling tethering" am: 8b2c23e4
am: d148f663 -s ours
am skip reason: change_id I4061c4b86c09718d834a5dc16d24c52ed7801b0f with SHA1 a40ce990 is in history
Change-Id: I61e740687398fb6035ecec33754179288fa445e1