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

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



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