[automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload am: e07aa4a4 am: ab72685e -s ours
am skip reason: Change-Id Ie73ba0586dafde67bc2726db26e07f7268c18be3 with SHA-1 e07aa4a4 is in history
Change-Id: Ibfe2701d288ef4567c3efe0226376041d4d374bb