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

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

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