Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362, 10101479, 10101363, 10101110, 10101480, 10102031, 10102032, 10101596, 10101364] into qt-qpr2-release

Change-Id: I8ae1db44867f849bcc5cd26b03bec2f104cb331e
diff --git a/apex/manifest.json b/apex/manifest.json
index f3f5b02..6739a4d 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.resolv",
-  "version": 299900000
+  "version": 290000000
 }