[automerger skipped] Use predefined function is_system_uid() am: 16723c37...
[automerger skipped] Use predefined function is_system_uid() am: 16723c37 am: 8b9ba75e am: add8a9a9 -s ours am: ca538fb7 -s ours
am skip reason: Change-Id I4c60e602e99ba466cbf48196f8538e3ae237ec4b with SHA-1 16723c37 is in history
Change-Id: I894bc707deb62f2d097a13a9b81ad9f9ef3d5e6e