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

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

Change-Id: I85e6f3c670a419427186abedfed375147ea632ec