Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev am: bf79852ae4
am: aa3e039ad7

Change-Id: I0891cf27dbe49ba18584e913d6a75b9223c10de4