Merge "[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -s ours" into rvc-dev-plus-aosp