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

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

Change-Id: Ieca9772ce7e176b4f6fc7c7c0856149a51b61afb