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