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

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



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