Merge "Support parsing timestamp and split parsing out" am: 1ad9e8fdcd am: 45390a92bf

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2307926

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