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

Change-Id: If9cdb4d701462ffb843bb071811e2dc3d227c9a2