Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode" into tm-dev am: 6dba362e am: fc91d9e6 am: 7fcf02ae

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



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