[automerger skipped] [Output Switcher] Allow subtext and flags on System Route am: 3c9b30a749 am: a60acac8fd am: e266393051 -s ours
am skip reason: Merged-In Id4c0d6832ead544a052ed20f7554f6b72c50192f with SHA-1 3c9b30a749 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23853603
Change-Id: Idcbcf84965a63cf00a4f9af112228af1808b01df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: