Merge "Update TimerFileDescriptor to support different task types" into main am: 97a4977f83 am: 3e5d5be1f1

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

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