Merge "Run the configure method when mtp or ptp is enabled." am: 7477c6a13a
am: e7e9fabc7c

Change-Id: I6edeb9069e0d806b186ce7520e5869c1965cbd89