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

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

Change-Id: I582853983ea6013f0bfec6841461602a6629c0b3