Merge "ActiveModeWarden: Cleanup Hw multi STA API calls" into sc-dev