Merge changes I8a307450,I24fd9dad

* changes:
  Update logic when multiple face sensors exist
  Do not assume that legacy HIDL HAL sensorIds == 0