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

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

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