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

[automerger skipped] Merge "Add missing isShellUser check" into oc-mr1-dev am: 0fb5377e am: f1a3a1e7 -s ours am: 2f744694 -s ours am: eb77f566 -s ours am: b18d53a3 -s ours am: f6189f54 -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/+/12172257

Change-Id: Id5a484f846f1f035089925d48d2f6e9e15ebc40a