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

Change-Id: I7c8bfab80e82d2841f43a75ce7fddc0b03cacc70