[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: 6ccd3e6b -s ours
am skip reason: Change-Id I4c60e602e99ba466cbf48196f8538e3ae237ec4b with SHA-1 16723c37 is in history
Change-Id: I597724f0dd0da4c91eaafe14710d39a5726f6168