Merge "Do not duck AAudio streams as a result of focus loss" into oc-dr1-dev am: be6989cb9d
am: 018e031d5d

Change-Id: Ia28b0fcd08435f1ba98d1f1d6299f88d1afea8e5