[automerger skipped] Merge "Also factor the floating rotation button into the...

[automerger skipped] Merge "Also factor the floating rotation button into the active touch region" into rvc-qpr-dev am: 8c13a901 am: ce223d88 -s ours

am skip reason: Change-Id I798370b41041e4f02bb82f5aeb20b9ccc1d2a4e8 with SHA-1 3e64e959 is in history

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

Change-Id: I64d42dfacf1ca8e86fb4c055aa064107c4e00c1e