Merge "Revert "Set NFC screen off test as optional before S"" into android12-tests-dev am: dcc97369bb

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

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