[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: 2192d9e9 -s ours

am skip reason: skipped by user chaviw

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

Change-Id: Ib42fc44b3e2b54fb8efe9d3771b9d5b5414f4712