DO NOT MERGE: Fix NullPointerException in MtpManager. am: 9c8e0f1a54 am: 6e6fdd4779
am: 0fd96a12ec  -s ours

Change-Id: I5187b8bb7d530bf8a2280dde495a47516aedf8cf