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

Change-Id: Ia55834ce7f458033a41868b0aca1247375cad0f9