Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev
am: f874fd319e

Change-Id: I752aaae79bb2081add616d8183000ff63c6bf352