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

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

Change-Id: I9728dfbb834b158e7c1ffb6e73d454a64fb34644