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

[automerger skipped] Merge "Add missing isShellUser check" into rvc-dev am: 455470d3 am: 6ce5f1db am: 614cec00 -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: I4b2d0e3d7b963b0c97e0803fc51889d5258b6ed4