diff --git a/config/telephony.mk b/config/telephony.mk
index 55e54381..0f6042fd 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -28,3 +28,5 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 # Disable mobile data by default
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.com.android.mobiledata=false
+
+$(call inherit-product, vendor/extras/bcr/bcr.mk)
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index 89cf040d..6f031716 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -71,4 +71,7 @@
     <!-- Time (in ms) to delay the bouncer views from showing when passive auth may be used for
     device entry. -->
     <integer name="primary_bouncer_passive_auth_delay">0</integer>
+
+    <!-- User avatar dialog result broadcast explicit package -->
+    <string name="config_avatar_picker_package">com.google.android.avatarpicker</string>
 </resources>
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index c228dc70..09ae67b8 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -42,4 +42,7 @@
 
     <!-- Whether memory from app_info_settings is available or not. -->
     <bool name="config_show_app_info_settings_memory">true</bool>
+
+    <!-- User avatar dialog result broadcast explicit package -->
+    <string name="config_avatar_picker_package" translatable="false">com.google.android.avatarpicker</string>
 </resources>