Merge "Remove ConnectivityManager swapActiveStatsMap API" am: 5635d505e0 am: ea97d4f1ae

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

Change-Id: I5f1e6517bd7ae11560dac93505ed4cd2f7510d3a