Merge "Merge "Give Divider back its touch-region" into rvc-dev am: 5a61909275 am: 307e4aa1bd" into rvc-d1-dev-plus-aosp am: 4b2ecd2254

Change-Id: Id272d988e914ebc08702d6b5f396f2552d3039f8