[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: 37862213 -s ours am: 917fa696 -s ours am: 712db83b -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: Ie5e23614fd1809306a89b60acfca1aa9809370e0