Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
am: f37dff724b

Change-Id: Iaa1ce493c5fc67e280e4e3d656f434ad86e74f80