Merge "Add per partition timestamp to 16K boot OTA" into main am: 6f0db025

Original change: https://android-review.googlesource.com/c/platform/build/+/2744293



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