Merge "Add missing isShellUser check" into oc-mr1-dev am: 0fb5377eb5

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

Change-Id: I20b599818c78955b120a68a5823948db46e96014