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

Change-Id: I0a83b1dc39015b588759e50ff16db5deaa2f6093