[automerger skipped] [Output Switcher] Allow subtext and flags on System Route...

[automerger skipped] [Output Switcher] Allow subtext and flags on System Route am: 3c9b30a7 am: 284af8c7 -s ours

am skip reason: Merged-In Id4c0d6832ead544a052ed20f7554f6b72c50192f with SHA-1 4fd6ffdc is already in history

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



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