[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output...

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea" into tm-dev am: 2291da76 am: 64b8005d am: 0ddd5121 am: 688bace4 -s ours

am skip reason: subject contains skip directive

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



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