[automerger skipped] fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting am: c9e66053 am: 2781fe4f -s ours
am skip reason: Change-Id I4393afcbe8e1bb886ecf4f5c1573f6ac8a0e29f5 with SHA-1 c9e66053 is in history
Change-Id: I38441c352f6fb7736e65014f39237d930b5fbc83