[automerger skipped] Merge "Disable entry point of output switcher" into rvc-qpr-dev am: faf7a2ad78
am: e71dc5640e
-s ours am: d46ff8c6d3
-s ours
am skip reason: Change-Id I8906878e1ba769d6940041f17d83b5de6b2a32c0 with SHA-1 b6840ced0d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686593
Change-Id: I23e2e24c187ef42b69e21a1f53e270a6c9249eb7
This commit is contained in: