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: 41af4c9f am: 8483e8d4 am: 0b1bb3d0

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



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