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

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



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