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: ee4580b7 am: 39ff2474

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

Change-Id: Iad09b44ed4726ed14ab2849f2d1826270b5987ec