Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev