tree 9ad848b1432cf6d15fa0bcbfb25a457e11b55c85
parent 54fcc9954b9e4064f6e4f6958525a599448f763e
parent 1849841b48a73de33530aadd92890ccfa8473a66
author Janis Danisevskis <jdanis@google.com> 1557341093 -0700
committer android-build-merger <android-build-merger@google.com> 1557341093 -0700

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

Change-Id: If416ad7de274420185e1cdc497399560f99bcbad