Merge "Add swapActiveStatsMap API for NetworkStatsFactory" am: 21f0d58294 am: a5883cfdf4 am: c453110da1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944730

Change-Id: I9d885e9f802619f255dea83601d45fa055459600