[automerger skipped] Merge "Revert "Update storage permission policy to use AppCompat APIs."" into rvc-dev am: 7d647467 am: 43c3ac2b am: 672962fc am: 6ff87a43 -s ours
am skip reason: Change-Id I31d4b989aea3b73efb3a3634073ee06b88e3ee97 with SHA-1 f1b1d900 is in history

Change-Id: I1b05b4c19553846b30552b60e78856d9b8236cea