Merge "Add MODIFY_DEFAULT_AUDIO_EFFECTS permission to shell" am: a3161c6627 am: 3637bc567d

Change-Id: I2fbc86155d031625dfd68605bb632cfca63c714d