DO NOT MERGE: Fix NullPointerException in MtpManager. am: 9c8e0f1a54
am: 6e6fdd4779

Change-Id: I83b323e21ea69b8bf51fc0c3896ef159868323ef