Merge "Update the IKeystoreService Binder API"