Merge "Support separating A11yManagers by device id" into udc-dev am: 1e7c22ab am: ad2a85b6

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



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