tree cec5a5f3d8048ceba4dda63b20bda2f75e175a44
parent dd2e7d498d5b030edf94aa444ce5c14b0ba1bb34
parent 2c2e9f1f4a144ab3edc8071cb3d3ade2b77fcd6a
author TreeHugger Robot <treehugger-gerrit@google.com> 1596492740 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596492740 +0000

[automerger skipped] Merge "Add missing isShellUser check" into qt-qpr1-dev am: 998144cf5e -s ours am: 2c2e9f1f4a -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/+/12171287

Change-Id: Ie9ff8d6aedfa9249dde7e4e02ca24a54da41ef32