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

Change-Id: I024b10373afa5dfd7255d0dccddb1bb653d496b4