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

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