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

Change-Id: I3849963d8913f2014625740bcab06dabffd96ecf