keystore: fully reset user keystore on request

The reset was improperly skipping the .masterkey file which left
keystore in a "LOCKED" state next time it was started up. The .masterkey
should have been deleted to leave it in the requested "UNINITIALIZED"
state next time it started.

It looks like some logic was left over to check the UID to see if it
matches the current user. Currently there's no way to have a UID in
the user directory that doesn't match the current user.

Bug: 13886753
Change-Id: Icd3a1a55153a0dd28a26d51a5ae7f6de1a7da043
1 file changed
tree: 5b7d328080987e41145d7c8af161c98cf19928bb
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/