Merge "APM: Avoid calling 'setOutputDevices' after adding output for HIDL" into main