Merge "Grant storage permission to the content capture service." into rvc-dev