Merge "Add idleTimer existence check before removing idleTimer" am: 40177cf4cb am: 204765e5e5 am: f0fb1e6e38

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

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