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

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

am skip reason: skipped by user chaviw

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

Change-Id: Ia39ba66924b7bd52e8f26aa6410b6efb0d72a4a5