Merge "Remove timestamp from local build number" into main am: 68f5fbf9

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



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