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

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

Change-Id: Ice52ebdc7df9248bc6077367174be1a9a9c30e77