Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote"