[automerger skipped] Use predefined function is_system_uid() am: 16723c37...
[automerger skipped] Use predefined function is_system_uid() am: 16723c37 am: 8b9ba75e -s ours am: 6a95afc5 -s ours
am skip reason: Change-Id I4c60e602e99ba466cbf48196f8538e3ae237ec4b with SHA-1 296fe578 is in history
Change-Id: I9f053eb329b2b2943a07a08881c751c8e3659b22