DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement am: 73706cee am: 16c4138e am: 11be1862

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



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