[automerger skipped] Merge "Disable entry point of output switcher" into...

[automerger skipped] Merge "Disable entry point of output switcher" into rvc-qpr-dev am: faf7a2ad am: e71dc564 -s ours

am skip reason: Change-Id I8906878e1ba769d6940041f17d83b5de6b2a32c0 with SHA-1 b6840ced is in history

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

Change-Id: Ia415edfd5886cfaf700f3d0362a52d488c3fe0e0