Merge "Disable entry point of output switcher" into rvc-qpr-dev am: faf7a2ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686593

Change-Id: I981a5fdc4356e41ceaf353b005077765568c6944