Merge "Reset one-time permission on app storage clear" into rvc-dev am: 64ea0ed7 am: a9cfd80c am: c87172cd am: cf54ce7f Change-Id: I039c3e28feaf882f8a7006e4029bb8f7fdd23b4c