[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "accessibility_floating_menu_controller" into sc-dev am: 23c4fc41 -s ours

am skip reason: skip tag Change-Id I2cbe690040a7e4ad15c1340a5ee146eb315b1d27 with SHA-1 bc4516eb is already in history

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

Change-Id: Ida965dcf412d1f9001613a7c3711dd4b5efaaad5