Merge cherrypicks of [13320072, 13319971, 13320351, 13320073, 13320352, 13320131, 13320074, 13320075, 13321410, 13320132, 13319972, 13320076, 13320077, 13320353, 13320354] into rvc-qpr2-release

Change-Id: Ic0a362da209b18c0d41b6eda6375d7972d5b0a30
diff --git a/device.mk b/device.mk
index e18b22d..7bedbe9 100644
--- a/device.mk
+++ b/device.mk
@@ -841,7 +841,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.vendor.build.svn=45
+    ro.vendor.build.svn=47
 
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.adb.secure=1