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: f1a32c19 am: ad3809c7 am: 238a0b7a

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



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