Merge "Extract duplicate part for hearing audio routing into SettingsLib" into udc-dev