Merge "Ask netd to swap stats map before reading"
am: e13a14d5cf

Change-Id: I7a683e479fe7631a167138314bcf5948e72386ec