Merge "Merge "Only handle resize touches if starting gesture within resize area" into rvc-dev am: dccddad3 am: cb1c9cc7" into rvc-d1-dev-plus-aosp