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

* commit '163f8a2e9132b60f86f28a352ded1db6a38d367e':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ibb6a051e31bb52c246be990fe79495f1f7252b9f