Merge "[Output switcher] Check current device" into tm-dev am: 49ab8398 am:...

Merge "[Output switcher] Check current device" into tm-dev am: 49ab8398 am: 3add1e63 am: 16f7b4a0

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



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