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

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

Change-Id: I3af9b6809c38b809ad546685ffca870fffff617d