Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" am: 393b67d65f am: 163f8a2e91
am: d767eba969

* commit 'd767eba969531b2df1ed41d82dac0853dce67cce':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I78cfc9155ab1ab43b4c8280f57f877b551882b9b