Make change and version bump to RPM1.220718.058
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26075426'] into rvc-platform-release.

Change-Id: I8400aafca676d05f67e18408c8dfb20c1532c85f
diff --git a/core/build_id.mk b/core/build_id.mk
index 7db8496..1672560 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=RPM1.220718.057
+BUILD_ID=RPM1.220718.058