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: cd0b1ff7c1219aca28af88e07802f99d7c0446cf
  1. core/
  2. services/
  3. tests/