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

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

Change-Id: I17028a9211391af67092e10cfe62b2498d0a25d4