Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev