Merge "Set static timestamps in protologtool output" into main am: 3d0cb6ccc8 am: 0c31471a40

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2961935

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