[automerger skipped] Merge "Add missing isShellUser check" into rvc-dev am: 455470d3b2 am: f761a5add1 -s ours am: e6d324638c -s ours

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

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

Change-Id: I6cfa239b68668437ea95266495c1dc32aff1ce4d