Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev