[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode" into tm-dev am: 6dba362ef1 am: 25a401d506 am: 92e71d0ff1 am: bfe768a015 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17752391 Change-Id: I022a827f1110103afd192741123118d20df998c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: