[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev
am:8e7794e97b-s ours am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA157f207b1c7is in history Change-Id: I30d66ea36a7beee9ccf940c547c47a6f7220e0a2
This commit is contained in: