Merge "tests: simplify BpfMap.reset(createMap()) -> BpfMap.resetMap()" am: 69777762e7

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

Change-Id: Ie6a1e6c21f6385b5413995a6b482cc9909a2909c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>