Merge changes from topic "am-197d7547c75c471a92ea5e0dcb59a884" into tm-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea" into tm-dev am: 2291da76 am: 64b8005d
DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set property for endTouchArea am: be6b577f am: 3be88799