diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c
index cb55ce982af9..725b1fbadd5f 100644
--- a/android/abi_gki_aarch64_db845c
+++ b/android/abi_gki_aarch64_db845c
@@ -1117,6 +1117,7 @@
   capable
   datagram_poll
   idr_alloc
+  idr_alloc_u32
   idr_get_next
   idr_remove
   lock_sock_nested
diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
index f541b9ac7ced..ac54b9159dc9 100644
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -210,6 +210,8 @@
   clk_hw_round_rate
   __clk_is_enabled
   __clk_mux_determine_rate_closest
+  clk_notifier_register
+  clk_notifier_unregister
   clk_prepare
   clk_put
   clk_register
@@ -635,6 +637,8 @@
   drm_atomic_helper_wait_for_vblanks
   drm_atomic_private_obj_init
   drm_atomic_set_crtc_for_connector
+  drm_atomic_set_crtc_for_plane
+  drm_atomic_set_fb_for_plane
   drm_atomic_set_fence_for_plane
   drm_atomic_set_mode_for_crtc
   drm_atomic_state_alloc
@@ -663,6 +667,7 @@
   drm_connector_list_iter_begin
   drm_connector_list_iter_end
   drm_connector_list_iter_next
+  drm_connector_list_update
   drm_connector_register
   drm_connector_set_tile_property
   drm_connector_unregister
@@ -673,9 +678,12 @@
   drm_crtc_init_with_planes
   drm_crtc_send_vblank_event
   drm_crtc_set_max_vblank_count
+  drm_crtc_vblank_get
   drm_crtc_vblank_off
   drm_crtc_vblank_on
+  drm_crtc_vblank_put
   drm_crtc_vblank_reset
+  drm_crtc_vblank_waitqueue
   drm_crtc_wait_one_vblank
   drm_cvt_mode
   drm_dbg
@@ -713,8 +721,10 @@
   drm_dp_link_train_channel_eq_delay
   drm_dp_link_train_clock_recovery_delay
   drm_dp_mst_allocate_vcpi
+  drm_dp_mst_atomic_check
   drm_dp_mst_deallocate_vcpi
   drm_dp_mst_detect_port
+  drm_dp_mst_dump_topology
   drm_dp_mst_get_edid
   drm_dp_mst_get_port_malloc
   drm_dp_mst_hpd_irq
@@ -733,6 +743,7 @@
   drm_err
   drm_event_reserve_init_locked
   drm_format_info
+  drm_framebuffer_cleanup
   drm_framebuffer_init
   drm_framebuffer_lookup
   drm_framebuffer_remove
@@ -768,11 +779,14 @@
   drm_ioctl
   drm_irq_install
   drm_irq_uninstall
+  drm_is_current_master
   drm_kms_helper_hotplug_event
   drm_kms_helper_poll_disable
   drm_kms_helper_poll_enable
   drm_kms_helper_poll_fini
   drm_kms_helper_poll_init
+  drm_master_get
+  drm_master_put
   drm_match_cea_mode
   drm_mm_init
   drm_mm_insert_node_in_range
@@ -788,6 +802,7 @@
   drm_mode_create_dp_colorspace_property
   drm_mode_create_tile_group
   drm_mode_debug_printmodeline
+  drm_mode_destroy
   drm_mode_duplicate
   drm_mode_equal
   drm_mode_get_tile_group
@@ -795,6 +810,7 @@
   drm_mode_object_get
   drm_mode_object_put
   drm_mode_probed_add
+  drm_mode_prune_invalid
   drm_modeset_acquire_fini
   drm_modeset_acquire_init
   drm_modeset_backoff
@@ -805,6 +821,7 @@
   drm_modeset_lock_all_ctx
   drm_mode_set_name
   drm_modeset_unlock_all
+  drm_mode_sort
   drm_mode_vrefresh
   drm_object_attach_property
   drm_object_property_set_value
@@ -833,6 +850,7 @@
   drm_property_lookup_blob
   drm_put_dev
   drm_read
+  drm_rect_rotate
   drm_release
   drm_rotation_simplify
   drm_send_event_locked
@@ -1580,6 +1598,7 @@
   of_property_read_u64_index
   of_property_read_variable_u16_array
   of_property_read_variable_u32_array
+  of_property_read_variable_u64_array
   of_property_read_variable_u8_array
   of_prop_next_string
   of_prop_next_u32
@@ -2703,6 +2722,7 @@
   vb2_create_bufs
   vb2_create_framevec
   vb2_destroy_framevec
+  vb2_dma_contig_memops
   vb2_dqbuf
   vb2_expbuf
   vb2_fop_mmap
diff --git a/build.config.gki_kasan b/build.config.gki_kasan
index b3273b10a01c..5528fabc8797 100644
--- a/build.config.gki_kasan
+++ b/build.config.gki_kasan
@@ -4,7 +4,6 @@ function update_kasan_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -e CONFIG_KASAN \
          -e CONFIG_KASAN_INLINE \
-         -e CONFIG_KASAN_PANIC_ON_WARN \
          -e CONFIG_KCOV \
          -e CONFIG_PANIC_ON_WARN_DEFAULT_ENABLE \
          -d CONFIG_RANDOMIZE_BASE \