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

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

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