Merge "Audio service: always unduck focus winner" into oc-dev
am: a78b6e7757

Change-Id: I09bf332200f5f67b6832e1f94992d6e2eb053c02