Merge "Only enforce caller is root for special commands" into udc-dev am: 418d02ed am: 02cef71f

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



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