[automerger skipped] Fix keystore wifi concurrency issue.
am: 54fcc9954b -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 4ea6d7a447 is in history

Change-Id: If834903f0f0266fd6b5713a4086742f356296769