[automerger skipped] Merge "Add MODIFY_DEFAULT_AUDIO_EFFECTS permission to shell" am: a3161c66 am: 3637bc56 -s ours
am skip reason: Change-Id Iba579001aeffd85743850727135a6f536579ea17 with SHA-1 e23ed868 is in history
Change-Id: I23da660390e9c2b86607c8117f3c4a27522482bf