Merge "Add MODIFY_DEFAULT_AUDIO_EFFECTS permission to shell" am: a3161c6627

Change-Id: I2d4d701409277b6ef98e84795a9851ea84a9a3f6