[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: 09b011ff -s ours am: 53db65ef -s ours am: e8e4ec86 -s ours am: f7624ad8 -s ours am: 15fc4e15 -s ours am: 3597e691 -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/+/12099340

Change-Id: Icb8e031c49f165f84fac45b69628a538785ea1db