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

Change-Id: Ib0f2f7c5921934e2921625fd267be0210542ff86