From 20bcb7c5fbe367b592c0a2245d9e3b5ba13d4483 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Wed, 16 Nov 2022 07:57:37 +0000
Subject: [PATCH] [Settings] Fix merge confliction

Follow code reviewer's suggestion to further split the code.

Bug: 259333639
Test: build pass
Change-Id: I40ee5f92dbb4550fec7e9bea108c30a2e5a0f770
---
 res/values/config.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/res/values/config.xml b/res/values/config.xml
index f5ad38b04d6..dbaabdf3041 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -639,4 +639,8 @@
 
     <!-- Whether to enable the app battery usage list page feature. -->
     <bool name="config_app_battery_usage_list_enabled">false</bool>
+
+    <!-- Whether sim related information is visible to the end user. -->
+    <bool name="config_show_sim_info">true</bool>
+
 </resources>