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

Change-Id: I63aa01522e358ee62f94fa8aa4ae2f881b6432ee