[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher]...

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Behavior improvement am: 73706cee am: df82c248 -s ours

am skip reason: subject contains skip directive

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



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