Merge "Update storage permission policy to use AppCompat APIs."