Merge "Fix issue with floating rotation button being in the wrong corner (sysui)" into tm-qpr-dev am: 30bd64c897 am: a8f22960e1

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

Change-Id: Ic32957cdd75a095ef5e5ad9a37b54f2475536b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>