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

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

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