[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement am: 73706cee am: 592631df am: e797f7be am: 4e4c0610 -s ours

am skip reason: subject contains skip directive

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



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