Merge "Update mActiveIdleTimers to use netId as a key" into main am: 9b6420bc13

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

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