Merge "Restore permission policy after test" into stage-aosp-sc-ts-dev am: 15fd9d341f am: 4a01a77636

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15685145

Change-Id: I70e2adca9eb79f77ad34d747265d290cd73fade1