Merge changes Ia9960af9,I6987d60c into oc-dev

* changes:
  NFC HAL no longer violates socket access restrictions
  Remove access to sock_file for hal_nfc

public/hal_nfc.te

@@ -13,4 +13,4 @@ allow hal_nfc nfc_device:chr_file rw_file_perms;
 
 # Data file accesses.
 allow hal_nfc nfc_data_file:dir create_dir_perms;
-allow hal_nfc nfc_data_file:notdevfile_class_set create_file_perms;
+allow hal_nfc nfc_data_file:{ file lnk_file fifo_file } create_file_perms;

vendor/hal_nfc_default.te

@@ -3,6 +3,3 @@ hal_server_domain(hal_nfc_default, hal_nfc)
 
 type hal_nfc_default_exec, exec_type, vendor_file_type, file_type;
 init_daemon_domain(hal_nfc_default)
-
-# TODO(b/37640900): Remove this one NFC HAL no longer needs access to nfc_data_file:sock_file
-typeattribute hal_nfc_default socket_between_core_and_vendor_violators;