[DO NOT MERGE] Enforce user separation on external storage
am: cc1cecc9be

Change-Id: I799c247ea5fc5b9cd051b3653e6a18d6e0eec6b8