Merge "Add same_vndk_variants.timestamp to checkbuild" am: 154c195e am:...

Merge "Add same_vndk_variants.timestamp to checkbuild" am: 154c195e am: 3abf1f7c am: 1e1f9f1c am: 4de690ff

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



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