Merge "Set FLAG_UPDATED_SYSTEM_APP properly for APEX packages"