Merge "Improved OpenExternalDirectoryActivity so it returns right away when an app already has the requested permission." into nyc-dev