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

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

Change-Id: I6c8f68d1006ec0be7979883e47cd49a0482250d0