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

Change-Id: Ie6ce8f381affe89137c911b3964412a1c16fdb80