Merge "Add AUDIO_ROUTING permission." into android-snapdragonGallery.lnx.2.0