Merge "[automerger skipped] Merge "Add missing isShellUser check" into...

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

am skip reason: Change-Id I23bb06e00f1623e4f27c02d7eb2c0d273b40771b with SHA-1 8f3de48e is in history

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

Change-Id: I7f69f6b1b1c4688deee8df9c883f9cf3c2700d8e