Merge "dumpProto fixed crypto performance dump fixed bug 35627933 Test: ran adb shell dumpsys fingerprint --proto > ~/Desktop/test.out protoc --decode_raw < ~/Desktop/test.out confirm that crypto output is fixed"