[conflict] DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea am: 92acd393

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



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