Merge "Change output switcher enable api flag to released flag" into...

Merge "Change output switcher enable api flag to released flag" into tm-qpr-dev am: 65e83680 am: 42fe4d70

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



Change-Id: I97beb1c4ac428811435d691c4170ad147f2944a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>