Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: Ie5ff5184b49e46a20cc74570095e1a5363c1c9ae
diff --git a/sepolicy/rild.te b/sepolicy/rild.te
index ff99a9d..52f0919 100644
--- a/sepolicy/rild.te
+++ b/sepolicy/rild.te
@@ -19,6 +19,9 @@
 allow rild mediaserver_service:service_manager find;
 allow rild per_mgr_service:service_manager find;
 
+# rild needs 'lock' for /vendor/qcril.db
+allow rild vendor_file:file { lock };
+
 # allow rild to use qualcomm's socket ipc ioctls
 allow rild self:socket ioctl;
 allowxperm rild self:socket ioctl msm_sock_ipc_ioctls;