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