Merge "Add missing @NonNull annotation to AndroidKeyStoreProvider method." into pi-dev