Merge "Restore resetKeyStore() logic of clearing SYSTEM uid"