Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
am: 3e4e9e234a

Change-Id: Ibce8d8983efc859d4c37168c900303db49f4e69a