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