Merge changes from topic "revert-1959735-NUPGEQOUCB" into android12-tests-dev am: 0f66cdd448

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

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