Merge "Making USB Input section of audio_policy.conf consistent across Android devices." into lmp-mr1-dev