Merge "Merge "Give Divider back its touch-region" into rvc-dev am: 5a619092 am: 307e4aa1" into rvc-d1-dev-plus-aosp