Merge "Make com.android.shell request MANAGE_EXTERNAL_STORAGE" am: 3095c56b3a am: 74c3cd9cca

Change-Id: Ic788d70fd078db5abaeb2460767c37772df53198