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

Change-Id: I520b96c0b8d130069e7752ca4716936b160a5e7a