Merge "Remove zeros from build number" into main am: 47d151be

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



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