[automerger skipped] Merge "Add missing isShellUser check" into rvc-dev am: 455470d3 am: f761a5ad -s ours

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

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

Change-Id: I999a0ed185bfaf5ef43d045b19b046e4594b5cc4