Merge "[Output Switcher] Increase test coverage" into tm-qpr-dev am: 09169acc

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



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