[automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple am: 68d998de am: b2c74e9b -s ours
am skip reason: Change-Id Ifebd946e06b5fa2eeb7ff4fc0b1c423097021692 with SHA-1 68d998de is in history
Change-Id: Idb4cd1a022c9321fa5d8f0a9707dbcd13a866f21