[automerger skipped] Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467f5 am: 43c3ac2b57 am: db58d92a47 -s ours
am skip reason: Change-Id I31d4b989aea3b73efb3a3634073ee06b88e3ee97 with SHA-1 51debb1f9b is in history
Change-Id: Ic453f108abd27eddad677ae8ed5d939beaa83491
This commit is contained in: