diff --git a/arch/arm64/configs/lineageos_oneplus3_defconfig b/arch/arm64/configs/lineageos_oneplus3_defconfig
index 0a4b2c4b6f6e..18ee9f237edd 100644
--- a/arch/arm64/configs/lineageos_oneplus3_defconfig
+++ b/arch/arm64/configs/lineageos_oneplus3_defconfig
@@ -1953,6 +1953,7 @@ CONFIG_SERIAL_MSM_SMD=y
 #
 # Diag Support
 #
+CONFIG_DIAG_CHAR=y
 
 #
 # DIAG traffic over USB
@@ -2577,6 +2578,8 @@ CONFIG_VIDEO_V4L2=y
 CONFIG_V4L2_MEM2MEM_DEV=y
 CONFIG_VIDEOBUF_GEN=y
 CONFIG_VIDEOBUF2_CORE=y
+CONFIG_VIDEOBUF2_MEMOPS=y
+CONFIG_VIDEOBUF2_VMALLOC=y
 # CONFIG_TTPCI_EEPROM is not set
 
 #
@@ -3358,7 +3361,21 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=4
 # CONFIG_USB_CI13XXX_MSM is not set
 # CONFIG_USB_CI13XXX_MSM_HSIC is not set
 # CONFIG_USB_DUMMY_HCD is not set
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_FS=y
+CONFIG_USB_F_UAC1=y
+CONFIG_USB_F_UAC2=y
+CONFIG_USB_F_UVC=y
+CONFIG_USB_F_AUDIO_SRC=y
 # CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_G_ANDROID=y
+# CONFIG_USB_ANDROID_RNDIS_DWORD_ALIGNED is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
@@ -4359,7 +4376,10 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
 CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+# CONFIG_SECURITY_APPARMOR_STATS is not set
+CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
 CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_INTEGRITY is not set
@@ -4585,7 +4605,6 @@ CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT=y
 CONFIG_NETFILTER_TPROXY=y
 CONFIG_IP6_NF_QUEUE=y
 CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
@@ -4597,7 +4616,6 @@ CONFIG_SQUASHFS_FILE_DIRECT=y
 # CONFIG_USB_CONFIGFS_QCRNDIS is not set
 # CONFIG_USB_CONFIGFS_RMNET_BAM is not set
 # CONFIG_USB_CONFIGFS_F_GSI is not set
-# CONFIG_SECURITY_APPARMOR_STATS is not set
 # CONFIG_BT_HCIBTSDIO is not set
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_CIFS_UPCALL is not set
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index efe6e8c526d7..c6164a7b2897 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -161,6 +161,9 @@ static int binder_set_stop_on_user_error(const char *val,
 module_param_call(stop_on_user_error, binder_set_stop_on_user_error,
 	param_get_int, &binder_stop_on_user_error, S_IWUSR | S_IRUGO);
 
+static bool binder_global_pid_lookups = true;
+module_param_named(global_pid_lookups, binder_global_pid_lookups, bool, S_IRUGO);
+
 #define binder_debug(mask, x...) \
 	do { \
 		if (binder_debug_mask & mask) \
@@ -4267,6 +4270,9 @@ static int binder_thread_read(struct binder_proc *proc,
 
 			tr.sender_pid = task_tgid_nr_ns(sender,
 							task_active_pid_ns(current));
+
+            if (binder_global_pid_lookups && tr.sender_pid == 0)
+                tr.sender_pid = task_tgid_nr(sender);
 		} else {
 			tr.sender_pid = 0;
 		}