Merge "Update Default AudioControl AIDL HAL for version 2" into tm-dev