Merge "[Output Switcher] Fix SASS device update in U" into udc-dev am: 6c388bfd am: aa841e50 am: 2d82de88 am: a21bcfb9

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



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