tree 263f1267d19ecc7928eea0469ea1b21a17d9d055
parent e8e4ec86a0f58d11e5659540c1953ea1f9306da7
parent 85828e5c4985eb88fc064840884d6588594336de
author John Reck <jreck@google.com> 1598663522 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598663522 +0000

[automerger skipped] Merge "Add missing isShellUser check" into pi-dev am: 85828e5c49 -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/+/12172258

Change-Id: I95c285335e58589b86928b45c9dae6e1d67f49e6