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

Change-Id: Ib88c3a21e3950fc32f9bc7380bcb9d23b6c605e3