Updated CTS test for Android Security b/228314987

Bug: 228314987
Bug: 235102183
Test: Ran the new testcase on android-11.0.0_r46 with/without patch

- Fixed test failure reported at b/284257743 due to null exception.
- Added AutoCloseable withSecureNfcDisabled() to run test with secure
nfc disabled.

Change-Id: I5f203d2545a2b227d83dcacfc08dc9afd8a30e19
1 file changed