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

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode am: 60607fd8 am: f6b1bffe -s ours

am skip reason: subject contains skip directive

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



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