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

Change-Id: I0e49560bb42908924a4e33db0b812af8e09f5be1