Merge changes I9a9dc54e,I2207765c,Ia164b6b3,If4bfd7b7

* changes:
  [HDM] Add rules to supports STA+STA and STA+AP
  [HDM] Add test chip 2 configuration - based on expected future chips
  [HDM] Reorganize unit test
  [HDM] Rename BaselineChip -> TestChipV1