Merge "Update mActiveIdleTimers to use netId as a key" into main