[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 9aa778a081 -s ours am: b8582d6392 -s ours am: 0fac0c27c8 -s ours

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

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

Change-Id: I3b335aa92d32bd699e5b3c897adae314fd8771d0