Merge cherrypicks of ['googleplex-android-review.googlesource.com/28537601'] into 24Q3-release.

Change-Id: Icbb9a5208c5a090d0a7eff6533eff8987d216e9c
diff --git a/scripts/buildinfo.py b/scripts/buildinfo.py
index e4fb0da..45c9bc3 100755
--- a/scripts/buildinfo.py
+++ b/scripts/buildinfo.py
@@ -97,7 +97,7 @@
 
       # Dev. branches should have DISPLAY_BUILD_NUMBER set
       if option.display_build_number:
-        print(f"ro.build.display.id?={option.build_id} {build_number} {option.build_keys}")
+        print(f"ro.build.display.id?={option.build_id}.{build_number} {option.build_keys}")
       else:
         print(f"ro.build.display.id?={option.build_id} {option.build_keys}")
     else: