Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev