Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea" into tm-dev am: 2291da76 am: cef08240

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



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