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

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

Change-Id: I8094cfb3fdff325b16ea6d1da1a632bb3f21490f