[automerger skipped] Merge "WM: Make AccessibilityController persistent" into...

[automerger skipped] Merge "WM: Make AccessibilityController persistent" into sc-v2-dev am: ef4d26ab am: 2a2de96f -s ours

am skip reason: Merged-In I5741ed373938963da129c410c5226dff5a84ce30 with SHA-1 652b54af is already in history

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

Change-Id: Ie94a7e85cbfbf7ebc932884145bffa613501ac2d