[automerger skipped] Merge "Add missing isShellUser check" into pi-dev am:...

[automerger skipped] Merge "Add missing isShellUser check" into pi-dev am: 85828e5c -s ours am: ffe95e0b -s ours am: 0c6ed6a6 -s ours am: 951d16b7 -s ours am: 5163123a -s ours

am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 8f3de48e is in history

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

Change-Id: I9445862a2eafa005435379c859070f447cf3a95c