[automerger skipped] Merge "Add back AccessibilityFloatingMenuController into StatusBar" into sc-v2-dev am: c5f67694 am: 5ef95b19 -s ours

am skip reason: Merged-In Iabb30895757afa1debe21d676cba019fef5c7c4e with SHA-1 5ad7f984 is already in history

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

Change-Id: Idddf7ed46fed15ddb6747f90cbed2569d5aab555