Merge changes Ib61ed2b1,I7a38a27b,I89f0df4a into oc-mr1-dev

* changes:
  [RESTRICT AUTOMERGE] CTS test for Android Security b/124462242
  [RESTRICT AUTOMERGE] Updated CTS test for Android Security b/147310271
  [RESTRICT AUTOMERGE] Add checks for supported NFC devices