[automerger skipped] Merge "Fix error config for accessibility floating menu under multi-users" into sc-dev am: 146efcb572 -s ours am: 76dd171d1f -s ours
am skip reason: Merged-In I4086b3a8b82c461f9368b58d6d390a661dd27f19 with SHA-1 f5f459ac34 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15061290
Change-Id: I7568f1092e56fb99234e2415d9882c0cfeb54d26
This commit is contained in: