[automerger skipped] Merge "Fix cast volume control bar not work" into...

[automerger skipped] Merge "Fix cast volume control bar not work" into rvc-qpr-dev am: 35f15fdb am: b243b9a8 -s ours

am skip reason: Change-Id I2c120f18e24a66aeff5565e952fa4064149ec540 with SHA-1 7f3efd43 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12613115

Change-Id: I4e64ef97f2519ef19a18d3c4256ff43e95d0dffa