Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-dev am: 8416431f37 am: ee7692c239 -s ours am: 3786221350 -s ours am: 917fa69690 -s ours am: 712db83bee -s ours" into rvc-qpr-dev-plus-aosp