Merge "audio_policy: modify few methods to appropriately override base"