Merge "Move TimerFdUtils JNI functionality into ServiceConnectivityJni" into main