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