Merge "Restore permission policy after test" into stage-aosp-sc-ts-dev