Merge "Also factor the floating rotation button into the active touch region" into rvc-qpr-dev am: 8c13a90189

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12336147

Change-Id: I81114027a37b66c888c8a70d929ae7094db39006