Merge "run-as: remove a special case." into main am: dbb4a111

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2826237



Change-Id: Ie40491d7a1815f44c299293e6aa8cd5fb7a1ad2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>