Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779

* changes:
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
  fix android.net.NetworkStatsTest#testApply464xlatAdjustments
  NetworkStats - no need for xt_qtaguid clat bw fixups
tree: 69db9694fc6f2f704c70e86a215b9f6619e58277
  1. core/
  2. packages/
  3. services/
  4. wifi/