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

Change-Id: I74d0fb81046ba2bbe392732c4198fd16f1eb6ed8