Merge changes from topic "ril-mem-monitor" into udc-dev

* changes:
  Add ril memory monitor
  rild: allow rild to ptrace
diff --git a/device.mk b/device.mk
index 2813186..f686621 100644
--- a/device.mk
+++ b/device.mk
@@ -23,3 +23,6 @@
 
 # Installs gsi keys into ramdisk, to boot a developer GSI with verified boot.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)
+
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml