Merge "[Output Switcher] Fix ArrayIndexOutOfBoundsException" into udc-dev am: 4711434e64 am: 51f71550bc am: 0994ef5c03

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

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