Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
am: da3d71f01e

Change-Id: I8000419d8abd92b247b7de6b5816cc43883facd1