[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am:...

[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f am: ee7692c2 -s ours

am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 bfdb7121 is in history

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

Change-Id: I0689df03f62b8ce269a436388ca1b0072800bdca