This reverts commit 5a14ba68. (from AOSP) Bug: 207057578 Test: manual: switch to MTP mode then re-plug Change-Id: I1e0b33395e164e566df6c8b5007e4cc1d5cd73b9