DO NOT MERGE: Fix NullPointerException in MtpManager.

BUG=30152892

Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
(cherry picked from commit 28e6112e2f2cef5852b20e53382ea717a5a6cd41)
1 file changed