[coastguard skipped] Merge sparse cherrypicks from sparse-11860263-L41200030004374858 into 24Q2-release.

COASTGUARD_SKIP: I3c0e4621a26f9e6d7bca7ac0db02c17f908f8b20

Change-Id: I0ce665bd5e90a861c6191b93a8c326a3470ae2e9
diff --git a/core/build_id.mk b/core/build_id.mk
index f6ecfd3..d363a90 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=AP2A.240605.024.A1
+BUILD_ID=AP2A.240705.004
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 8a8a613..bf7be98 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -490,7 +490,6 @@
       return -1
 
     props = [
-        "ro.board.api_level",
         "ro.board.first_api_level",
         "ro.product.first_api_level",
     ]