Merge changes I51628abe,I412d62b7 into rvc-dev am: 82e0c384f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12100252

Change-Id: Icfc2c61bfc0367e74328a13aefccf54b04c199f2
diff --git a/adb/apex/apex_manifest.json b/adb/apex/apex_manifest.json
index 0444409..c825b04 100644
--- a/adb/apex/apex_manifest.json
+++ b/adb/apex/apex_manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.adbd",
-  "version": 300000000
+  "version": 309999900
 }