Merge "strong fp lockout after 20 failed attempts" into oc-dev
am: 310818ff82

Change-Id: I52787e3db92ae9795932156335ee5c55f5c920a9