Merge "Thread: fill in ticks in active timestamp" into main am: 4355dae9d8 am: 908c2436ac

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

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