Merge "Don't clear kesytore after 5 auth failures." am: 44f4d85dcf am: 3b3599385a
am: de8da20454

Change-Id: Ic29778612a8da21352ca1477f7588f71737728de