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

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



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