Merge "Use UserHandle.isCore() instead of Process.myUid() < Process.FIRST_APPLICATION_UID to determine if the process is a system process." into main