Merge "Update FINGERPRINT_ERROR_LOCKOUT documentation" into oc-mr1-dev
am: d952a8b81a

Change-Id: I30c3a2c7a633e3e0201d966c4cc6f5d406a5c1a8