Merge "Remove 'Audio output' feature for Android U" into udc-dev