diff --git a/rro_overlays/CarrierConfigOverlayStone/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlayStone/res/xml/vendor.xml
index b8e2d76..17a02a1 100644
--- a/rro_overlays/CarrierConfigOverlayStone/res/xml/vendor.xml
+++ b/rro_overlays/CarrierConfigOverlayStone/res/xml/vendor.xml
@@ -45,9 +45,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -113,13 +115,27 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
com.example.android.locationattribution
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- connected_mmwave:5GUWB,connected:5g,not_restricted:None,restricted:None
@@ -127,7 +143,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
+
+
@@ -147,7 +164,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
@@ -174,6 +190,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -184,10 +201,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
-
-
+
+
@@ -211,10 +229,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -256,6 +276,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -287,7 +308,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
+
+
@@ -296,9 +318,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
-
+
@@ -328,11 +352,20 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
-
+
+
@@ -360,15 +393,26 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
@@ -595,13 +639,25 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
@@ -613,21 +669,26 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
+
+
-
+
+
+
+
+
@@ -639,12 +700,19 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
@@ -653,10 +721,28 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1377,8 +1463,19 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
@@ -1469,6 +1566,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -1490,6 +1588,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -1538,17 +1637,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
China Mobile
-
-
+
+
-
-
-
@@ -1558,6 +1654,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -1580,6 +1679,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
China Unicom
+
@@ -1596,6 +1696,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -1644,17 +1745,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
China Mobile
-
-
+
+
-
-
-
@@ -1664,6 +1762,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -1705,23 +1806,82 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ China Mobile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1746,6 +1906,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -1764,6 +1926,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
China Unicom
+
@@ -1777,6 +1940,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -1824,17 +1988,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
-
+
+
-
-
-
@@ -1844,6 +2005,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -1890,17 +2054,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
-
+
+
-
-
-
@@ -1910,6 +2071,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -1927,6 +2091,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
China Unicom
+
@@ -1943,6 +2108,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -1993,11 +2159,14 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -2032,13 +2201,189 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ China Mobile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ China Broadcasting
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ China Unicom
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2054,6 +2399,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2068,6 +2414,23 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2081,6 +2444,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2097,6 +2461,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2107,6 +2472,22 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2114,14 +2495,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
-
-
-
-
-
-
-
-
+
@@ -2138,6 +2512,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2153,6 +2528,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2168,6 +2544,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2183,6 +2560,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2201,6 +2579,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2216,6 +2595,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2232,6 +2612,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2246,6 +2627,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
@@ -2258,6 +2645,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -2265,6 +2655,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2272,6 +2664,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2285,6 +2679,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -2292,6 +2689,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2299,6 +2698,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2306,6 +2707,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2313,6 +2716,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2320,6 +2725,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2338,6 +2745,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
@@ -2345,6 +2755,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2375,6 +2787,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2382,6 +2796,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
@@ -2403,6 +2819,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2453,6 +2870,35 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2574,6 +3020,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
@@ -2615,8 +3070,13 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
@@ -2625,6 +3085,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
@@ -2662,4 +3123,2073 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 41919
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+ 3
+ supl.rm-n.jp
+ 7275
+
+
+ 3
+ supl.rm-n.jp
+ 7275
+
+
+ 3
+
+
+ 3
+ supl.rm-n.jp
+ 7275
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CBN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +436762200
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +31624001233
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +420603123311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +48602950000
+
+
+
+
+
+ X-MDN: ##LINE1##
+
+
+
+
+
+
+
+
+
+ +36309888444
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +38598151100
+
+
+
+
+
+
+
+
+
+
+ +421903333999
+
+
+
+
+
+
+
+ 121
+
+
+
+
+
+
+
+
+ 171
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +31654501233
+ vodafone NL
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +6421700700
+
+
+
+
+
+
+
+
+
+
+
+ 123
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +40722033334
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 132
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5500
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 22177
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 42020
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ vvm_type_omtp
+ 21101
+ //VVM
+ 888
+ com.google.android.ims
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 22123
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [B]_[MN]_[DI]
+
+
+
+
+
+
+
+
+
+
+
+ 242
+ com.google.android.ims
+
+
+
+
+
+
+
+
+
+ +447458333222
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +306971000123
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Partner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ vvm_type_omtp
+ 64085
+ //VVM
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +40766177177
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ vvm_type_omtp
+ 8082
+ //VVM
+ 5555
+
+
+
+
+
+ vvm_type_omtp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *99
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +420608989898
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 901
+ 901
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 170
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 501501501
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 133
+
+
+
+
+
+
+ 200
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [B]_[MN]_[DI]
+
+
+ sunsurf
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ T star
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ JIO 4G:JIO True5G
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1:7200000:60000:5000:30000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +436762200
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +6421700700
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +38598151100
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +48602950000
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 242
+ com.google.android.ims
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +421903333999
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +31624001233
+
+
+
+
+
+
+
+
+
+
+ 171
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +420603123311
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3311
+
+
+
+
+
+
+
+
+
+
+ 5500
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +420608989898
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 121
+
+
+
+
+
+
+
+
+
+ +36309888444
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +31624001233
+
+
+ +41784091233
+
+
+ +353896191171
+
+
+
+
+
+
+
+
+
+
+ [B]_[MN]_[DI]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+