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

[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf -s ours am: 2c2e9f1f -s ours am: f80ba3a9 -s ours

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

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

Change-Id: I9dc9e9237f6023830089ccfc587d9bc7933a8bb8