[automerger skipped] Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112 am: 536830ac65
am: 667dadb67a -s ours
am skip reason: change_id Ice20ffcba2a0994c599dbebace252138ffd827de with SHA1 5d85bf3127 is in history

Change-Id: I9fe03c2c1e58979b28f5d8a34a6659ce487fd91e