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

Merge "Disable output switcher in resumption controls" into rvc-dev am: f4b12ac2 am: a404f668 am: 07d322a2 am: 1e9b6614

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

Change-Id: Ib9fe5b4e336484193098317452728a7436cb80ce