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: Ib61fdc6adad6d4d7531086f653357f5468aafaf8