Merge "Use UserHandle.USER_SYSTEM in place of 0."