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