[automerger skipped] Merge "Accessibility fix for ShellRoot" into sc-dev am:...

[automerger skipped] Merge "Accessibility fix for ShellRoot" into sc-dev am: 8f21448a am: 43bce9ed -s ours

am skip reason: Merged-In Iee982e9f17b496d413d4733f0a99997f81cee527 with SHA-1 90be6f3d is already in history

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

Change-Id: Ic19ee4005ab852c517c3dd0d6f10f93fcff7a68a