[automerger skipped] Merge "Add missing isShellUser check" into oc-dev am: adc8f21ad1 am: ef301aba3e -s ours am: 09b011ffca -s ours am: 53db65ef90 -s ours am: e8e4ec86a0 -s ours am: f7624ad857 -s ours am: 15fc4e152a -s ours am: 3597e69108 -s ours

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

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

Change-Id: Icb8e031c49f165f84fac45b69628a538785ea1db