Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev