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

Change-Id: I38a3bd9cd1743286cb87ed75136934b9c715f35b