Merge "Fix volume slider not showing when casting in the background" into...

Merge "Fix volume slider not showing when casting in the background" into udc-dev am: f96e49ed am: 456d2dc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23726250



Change-Id: If238a76d52f54c8c8ae99d085283f560c61f4b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>