Merge "Add missing isShellUser check" into rvc-dev am: 455470d3b2

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

Change-Id: Ie38ba3aaa00b4e85058d8832f559825d22494e0e