Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev