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

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

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