[automerger skipped] Merge "Fix error config for accessibility floating menu...

[automerger skipped] Merge "Fix error config for accessibility floating menu under multi-users" into sc-dev am: 146efcb5 am: 3a7f358f -s ours am: d7b755de -s ours

am skip reason: Merged-In I4086b3a8b82c461f9368b58d6d390a661dd27f19 with SHA-1 f5f459ac is already in history

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

Change-Id: I3480470c5c28e52763f531ea30c738635351b8a5