Test: manual, connect with MTP and PTP Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9 (cherry picked from commitf7ec16802c) (cherry picked from commitefb865ace2) (cherry picked from commit5954d210d3)
Test: manual, connect with MTP and PTP Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9 (cherry picked from commitf7ec16802c) (cherry picked from commitefb865ace2) (cherry picked from commit5954d210d3)