Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout...

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

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



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