Merge changes from topic "revert-2649121-cm_vintf_workaround-PMVOGMKMBW"

* changes:
  Revert "Only allow cuttlefish to use FCM 9 HALs"
  Revert "Allow fingerprint HAL to be updated via apex in U"