[automerger skipped]Merge "Add capabilities to wifi HAL service" am: 22b042227b
am: 67b657dab9  -s ours

Change-Id: I5319eea59c8255c68dfcb4eb45b230eabda017df