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

Change-Id: Ib37caee216c17e620ace771223ae73aa88d8f19b