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

Change-Id: I5af140a52e428cf9c2ef8b0501e86d12295e1a30