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

[automerger skipped] Merge "Add missing isShellUser check" into oc-dev am: adc8f21a am: ef301aba -s ours

am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 3a5cd5bb is in history

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

Change-Id: Ic6d15d294e9a742e1c08fa1bc6d5c006a83d6994