[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev am: 197077dc8f -s ours
am:811f91f337-s ours am skip reason: change_id I8fa37c26bec23ffca0b29b679e72ba1189f557f1 with SHA1876218abcbis in history Change-Id: I863180a63bcbaa7f7ed76fc759e2f8f2dae1d764
This commit is contained in: