Merge "binderLibTest: epoch->uptime" into main am: 3987d12297 am: a2466e090d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3391722

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