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

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

Change-Id: I3b4ff681498beddd7bf2bc8ed02d422e12fc69dd