Snap for 10804332 from f7a71debb7 to udc-qpr1-release

Change-Id: I9d3b4acf44130d0d59896b0587b07bd43ea2652d

conf/init.gs201.rc

@@ -701,7 +701,7 @@ on property:sys.boot_completed=1
 
     # Enable ZRAM on boot_complete
     swapon_all /vendor/etc/fstab.${ro.board.platform}
-    write /proc/sys/vm/swappiness 100
+    write /proc/sys/vm/swappiness 60
 
     # Adjust watermark level
     write /proc/sys/vm/watermark_scale_factor 200

device.mk

@@ -1162,6 +1162,10 @@ PRODUCT_COPY_FILES += \
 # Call deleteAllKeys if vold detects a factory reset
 PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=true
 
+# Increase lmkd aggressiveness
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.lmk.swap_free_low_percentage=100
+
 # Hardware Info
 include hardware/google/pixel/HardwareInfo/HardwareInfo.mk