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

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



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