Merge "Disable output switcher in resumption controls" into rvc-dev am:...

Merge "Disable output switcher in resumption controls" into rvc-dev am: f4b12ac2 am: 78dd61d2 am: ff344610 am: 63e3c54c

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

Change-Id: I4ff0263654136a3896c718059638eb1da6966de2