[automerger skipped] Merge "[conflict] DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea am: 92acd393" into tm-qpr-dev-plus-aosp am: 71f3d9ee -s ours

am skip reason: subject contains skip directive

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



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