Merge "Add notify keystore method to FPS JNI"