[automerger skipped] Use predefined function is_system_uid() am: 16723c37 -s...
[automerger skipped] Use predefined function is_system_uid() am: 16723c37 -s ours am: 829cacc4 -s ours
am skip reason: Change-Id I4c60e602e99ba466cbf48196f8538e3ae237ec4b with SHA-1 16723c37 is in history
Change-Id: Ib238a4a0d440d15ec3da7f6caf5ce6d61bbcc328