am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"

* commit 'c4193f1fef52314b451f55cce48ce44f94b875b6':
  Migrate keychain directories to /data/misc/user/0