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

Change-Id: I91c8938e31a6db597e38c206e5de8c34fb2e1a5a