Merge "Merge "Only handle resize touches if starting gesture within resize area" into rvc-dev am: dccddad314 am: cb1c9cc7b8 am: c92cb26a11" into rvc-qpr-dev-plus-aosp