Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev am: 382644aa74
am: deb56eb3f5

Change-Id: If56248e5b335edd5bea547fd503106664b26bad5