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

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

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