[automerger skipped] Fix keystore wifi concurrency issue. am: 1d898d107c -s ours
am: e583877904 -s ours
am skip reason: change_id I8c5602d2c2cb1dd9423df713037e99b247cee71f with SHA1 1849841b48 is in history

Change-Id: I64158f8b9ca9c7ec1e67ae7a9f495f2857965a92