Merge "[Output Switcher] Fix ArrayIndexOutOfBoundsException" into udc-dev am: 4711434e am: 457b79e7 am: 2c6d1523 am: d2d5ff9b

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



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