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

Change-Id: Ib08d01e09c7b55f95d10117267bf4456d811d1ee