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

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

Change-Id: Id3a5275f5dfb690fdd20370e06ee3bd715799d8f