[automerger skipped] Merge changes from topic "revert-1959735-NUPGEQOUCB" into android12-tests-dev am: 0f66cdd448 am: bdbbcc07fb -s ours

am skip reason: Merged-In I2e84193668dcdf24bde1c7e12b3cfd8a03954a16 with SHA-1 23173455ab is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1956657

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/2014656

Change-Id: I2004728523452ba0f5554c6cc585d93f398c76f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>