diff --git a/bluetooth-mac/Android.bp b/bluetooth-mac/Android.bp
deleted file mode 100644
index c2c4865c1f6633b9aa9bcec6182b9dfbc897ea92..0000000000000000000000000000000000000000
--- a/bluetooth-mac/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-sh_binary {
-    name: "bluetooth-mac_FP4",
-    init_rc: ["bluetooth-mac_FP4.rc"],
-    src: "bluetooth-mac_FP4.sh",
-    vendor: true,
-}
diff --git a/bluetooth-mac/bluetooth-mac_FP4.rc b/bluetooth-mac/bluetooth-mac_FP4.rc
deleted file mode 100644
index 6951cb315f664b8e1e6af2df132d07e25902bdac..0000000000000000000000000000000000000000
--- a/bluetooth-mac/bluetooth-mac_FP4.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service vendor.bluetooth-mac_FP4 /vendor/bin/bluetooth-mac_FP4
-    class core
-    group root system
-    oneshot
-
-on post-fs
-    mkdir /mnt/vendor/persist/t2m_param 0777 root system
diff --git a/bluetooth-mac/bluetooth-mac_FP4.sh b/bluetooth-mac/bluetooth-mac_FP4.sh
deleted file mode 100644
index 39cc60268e55ff40f1633948453b031efb43534d..0000000000000000000000000000000000000000
--- a/bluetooth-mac/bluetooth-mac_FP4.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/vendor/bin/sh
-BT_MACADDR=/mnt/vendor/persist/t2m_param/bt_macaddr
-
-setprop persist.vendor.service.bdroid.bdaddr $(cat "$BT_MACADDR")
diff --git a/device.mk b/device.mk
index 0b7b4dd26fded57c26302c13216ad378f3fa86fe..07a506338e97fff2147f2b13b81fa5d90bccb70d 100644
--- a/device.mk
+++ b/device.mk
@@ -181,10 +181,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.btconfigstore@1.0.vendor \
     vendor.qti.hardware.btconfigstore@2.0.vendor
 
-# Bluetooth (MAC)
-PRODUCT_PACKAGES += \
-    bluetooth-mac_FP4
-
 # Camera
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2714d717719f933cc51152f26f45ca129b011eb4..b771b10c6474ff0e0c1d4747b42d53bbab871d57 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -75,78 +75,631 @@
     -->
     <bool name="config_wifiDisplaySupportsProtectedBuffers">true</bool>
 
-    <!-- Flag indicating whether the we should enable the automatic brightness in Settings.
+    <!-- Flag indicating whether we should enable the automatic brightness.
          Software implementation will be used if config_hardware_auto_brightness_available is not set -->
     <bool name="config_automatic_brightness_available">true</bool>
 
-    <!-- Array of light sensor lux values to define our levels for auto backlight brightness support.
-         The N entries of this array define N + 1 control points as follows:
-         (1-based arrays)
-         Point 1:            (0, value[1]):             lux <= 0
-         Point 2:     (level[1], value[2]):  0        < lux <= level[1]
-         Point 3:     (level[2], value[3]):  level[2] < lux <= level[3]
-         ...
-         Point N+1: (level[N], value[N+1]):  level[N] < lux
-         The control points must be strictly increasing.  Each control point
-         corresponds to an entry in the brightness backlight values arrays.
-         For example, if lux == level[1] (first element of the levels array)
-         then the brightness will be determined by value[2] (second element
-         of the brightness values array).
-         Spline interpolation is used to determine the auto-brightness
-         backlight values for lux levels between these control points.
-         Must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLevels">
-        <item>1</item>
-        <item>10</item>
-        <item>50</item>
-        <item>100</item>
-        <item>500</item>
-        <item>1000</item>
-        <item>3000</item>
-    </integer-array>
+    <!-- User activity timeout: Maximum screen dim duration as a percentage of screen off timeout.
+         This resource is similar to config_maximumScreenDimDuration but the maximum
+         screen dim duration is defined as a ratio of the overall screen off timeout
+         instead of as an absolute value in milliseconds.  This is useful for reducing
+         the dim duration when the screen off timeout is very short.
+         When computing the screen dim duration, the power manager uses the lesser
+         of the effective durations expressed by config_maximumScreenDimDuration and
+         config_maximumScreenDimRatio.
+         This value must be between 0% and 100%.  If the value is zero, the screen will not
+         dim before the device goes to sleep.
+    -->
+    <fraction name="config_maximumScreenDimRatio">29.999996%</fraction>
 
     <!-- Stability requirements in milliseconds for accepting a new brightness level.  This is used
          for debouncing the light sensor.  Different constants are used to debounce the light sensor
          when adapting to brighter or darker environments.  This parameter controls how quickly
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
-    <integer name="config_autoBrightnessDarkeningLightDebounce">1000</integer>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+    <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
-    <!-- Minimum screen brightness setting allowed by the power manager.
-        The user is forbidden from setting the brightness below this level. -->
-    <integer name="config_screenBrightnessSettingMinimum">3</integer>
+    <!-- Default screen brightness setting.
+         Must be in the range specified by minimum and maximum. -->
+    <integer name="config_screenBrightnessSettingDefault">128</integer>
 
     <!-- Screen brightness used to dim the screen when the user activity
          timeout expires.  May be less than the minimum allowed brightness setting
          that can be set by the user. -->
-    <integer name="config_screenBrightnessDim">3</integer>
-
-    <!-- Minimum allowable screen brightness to use in a very dark room.
-         This value sets the floor for the darkest possible auto-brightness
-         adjustment.  It is expected to be somewhat less than the first entry in
-         config_autoBrightnessLcdBacklightValues so as to allow the user to have
-         some range of adjustment to dim the screen further than usual in very
-         dark rooms. The contents of the screen must still be clearly visible
-         in darkness (although they may not be visible in a bright room). -->
-    <integer name="config_screenBrightnessDark">3</integer>
-
-    <!-- Array of output values for LCD backlight corresponding to the LUX values
-         in the config_autoBrightnessLevels array.  This array should have size one greater
-         than the size of the config_autoBrightnessLevels array.
-         The brightness values must be between 0 and 255 and be non-decreasing.
-         This must be overridden in platform specific overlays -->
-    <integer-array name="config_autoBrightnessLcdBacklightValues">
+    <integer name="config_screenBrightnessDim">1</integer>
+
+    <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
+         The N entries of this array define N  1 zones as follows:
+         Zone 0:        0 <= LUX < array[0]
+         Zone 1:        array[0] <= LUX < array[1]
+         ...
+         Zone N:        array[N - 1] <= LUX < array[N]
+         Zone N + 1     array[N] <= LUX < infinity
+         Must be overridden in platform specific overlays -->
+    <integer-array name="config_autoBrightnessLevels">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>8</item>
+        <item>12</item>
+        <item>20</item>
+        <item>33</item>
+        <item>55</item>
+        <item>90</item>
+        <item>148</item>
+        <item>245</item>
+        <item>403</item>
+        <item>665</item>
+        <item>1097</item>
+        <item>1808</item>
+        <item>2981</item>
+        <item>5000</item>
+    </integer-array>
+
+    <!-- Array of desired screen brightness in nits corresponding to the lux values
+         in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and
+         config_screenBrightnessMaximumNits, the display brightness is defined as the measured
+         brightness of an all-white image.
+         If this is defined then:
+            - config_autoBrightnessLcdBacklightValues should not be defined
+            - config_screenBrightnessNits must be defined
+            - config_screenBrightnessBacklight must be defined
+         This array should have size one greater than the size of the config_autoBrightnessLevels
+         array. The brightness values must be non-negative and non-decreasing. This must be
+         overridden in platform specific overlays -->
+    <array name="config_autoBrightnessDisplayValuesNits">
+        <item>10.45935</item>   <!-- 0-1 -->
+        <item>29.25559</item>   <!-- 1-2 -->
+        <item>34.240692</item>  <!-- 2-3 -->
+        <item>37.514347</item>  <!-- 3-4 -->
+        <item>40.018696</item>  <!-- 4-8 -->
+        <item>46.885098</item>  <!-- 8-12 -->
+        <item>51.626434</item>  <!-- 12-20 -->
+        <item>58.610405</item>  <!-- 20-33 -->
+        <item>66.890915</item>  <!-- 33-55 -->
+        <item>77.61644</item>   <!-- 55-90 -->
+        <item>90.221886</item>  <!-- 90-148 -->
+        <item>105.80314</item>  <!-- 148-245 -->
+        <item>126.073845</item> <!-- 245-403 -->
+        <item>154.16931</item>  <!-- 403-665 -->
+        <item>191.83717</item>  <!-- 665-1097 -->
+        <item>240.74442</item>  <!-- 1097-1808 -->
+        <item>294.84857</item>  <!-- 1808-2981 -->
+        <item>348.05453</item>  <!-- 2981-5000 -->
+        <item>389.70</item>     <!-- 5000+ -->
+    </array>
+
+    <!-- Minimum screen brightness setting allowed by the power manager.
+         The user is forbidden from setting the brightness below this level. -->
+    <integer name="config_screenBrightnessSettingMinimum">1</integer>
+
+    <!-- An array describing the screen's backlight values corresponding to the brightness
+         values in the config_screenBrightnessNits array.
+         This array should be equal in size to config_screenBrightnessBacklight. -->
+    <integer-array name="config_screenBrightnessBacklight">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
         <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
         <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>24</item>
+        <item>25</item>
+        <item>26</item>
+        <item>27</item>
+        <item>28</item>
+        <item>29</item>
+        <item>30</item>
+        <item>31</item>
+        <item>32</item>
+        <item>33</item>
+        <item>34</item>
+        <item>35</item>
+        <item>36</item>
+        <item>37</item>
+        <item>38</item>
+        <item>39</item>
         <item>40</item>
+        <item>41</item>
+        <item>42</item>
+        <item>43</item>
+        <item>44</item>
+        <item>45</item>
+        <item>46</item>
+        <item>47</item>
+        <item>48</item>
+        <item>49</item>
+        <item>50</item>
+        <item>51</item>
+        <item>52</item>
+        <item>53</item>
+        <item>54</item>
+        <item>55</item>
+        <item>56</item>
+        <item>57</item>
+        <item>58</item>
+        <item>59</item>
+        <item>60</item>
+        <item>61</item>
+        <item>62</item>
+        <item>63</item>
+        <item>64</item>
+        <item>65</item>
+        <item>66</item>
+        <item>67</item>
+        <item>68</item>
+        <item>69</item>
         <item>70</item>
+        <item>71</item>
+        <item>72</item>
+        <item>73</item>
+        <item>74</item>
+        <item>75</item>
+        <item>76</item>
+        <item>77</item>
+        <item>78</item>
+        <item>79</item>
+        <item>80</item>
+        <item>81</item>
+        <item>82</item>
+        <item>83</item>
+        <item>84</item>
+        <item>85</item>
+        <item>86</item>
+        <item>87</item>
+        <item>88</item>
+        <item>89</item>
+        <item>90</item>
+        <item>91</item>
+        <item>92</item>
+        <item>93</item>
+        <item>94</item>
+        <item>95</item>
+        <item>96</item>
+        <item>97</item>
+        <item>98</item>
+        <item>99</item>
+        <item>100</item>
+        <item>101</item>
+        <item>102</item>
+        <item>103</item>
+        <item>104</item>
+        <item>105</item>
+        <item>106</item>
+        <item>107</item>
+        <item>108</item>
+        <item>109</item>
         <item>110</item>
+        <item>111</item>
+        <item>112</item>
+        <item>113</item>
+        <item>114</item>
+        <item>115</item>
+        <item>116</item>
+        <item>117</item>
+        <item>118</item>
+        <item>119</item>
+        <item>120</item>
+        <item>121</item>
+        <item>122</item>
+        <item>123</item>
+        <item>124</item>
+        <item>125</item>
+        <item>126</item>
+        <item>127</item>
+        <item>128</item>
+        <item>129</item>
+        <item>130</item>
+        <item>131</item>
+        <item>132</item>
+        <item>133</item>
+        <item>134</item>
+        <item>135</item>
+        <item>136</item>
+        <item>137</item>
+        <item>138</item>
+        <item>139</item>
+        <item>140</item>
+        <item>141</item>
+        <item>142</item>
+        <item>143</item>
+        <item>144</item>
+        <item>145</item>
+        <item>146</item>
+        <item>147</item>
+        <item>148</item>
+        <item>149</item>
+        <item>150</item>
+        <item>151</item>
+        <item>152</item>
+        <item>153</item>
+        <item>154</item>
+        <item>155</item>
+        <item>156</item>
+        <item>157</item>
+        <item>158</item>
+        <item>159</item>
         <item>160</item>
+        <item>161</item>
+        <item>162</item>
+        <item>163</item>
+        <item>164</item>
+        <item>165</item>
+        <item>166</item>
+        <item>167</item>
+        <item>168</item>
+        <item>169</item>
+        <item>170</item>
+        <item>171</item>
+        <item>172</item>
+        <item>173</item>
+        <item>174</item>
+        <item>175</item>
+        <item>176</item>
+        <item>177</item>
+        <item>178</item>
+        <item>179</item>
+        <item>180</item>
+        <item>181</item>
+        <item>182</item>
+        <item>183</item>
+        <item>184</item>
+        <item>185</item>
+        <item>186</item>
+        <item>187</item>
+        <item>188</item>
+        <item>189</item>
+        <item>190</item>
+        <item>191</item>
+        <item>192</item>
+        <item>193</item>
+        <item>194</item>
+        <item>195</item>
+        <item>196</item>
+        <item>197</item>
+        <item>198</item>
+        <item>199</item>
         <item>200</item>
+        <item>201</item>
+        <item>202</item>
+        <item>203</item>
+        <item>204</item>
+        <item>205</item>
+        <item>206</item>
+        <item>207</item>
+        <item>208</item>
+        <item>209</item>
+        <item>210</item>
+        <item>211</item>
+        <item>212</item>
+        <item>213</item>
+        <item>214</item>
+        <item>215</item>
+        <item>216</item>
+        <item>217</item>
+        <item>218</item>
+        <item>219</item>
+        <item>220</item>
+        <item>221</item>
+        <item>222</item>
+        <item>223</item>
+        <item>224</item>
+        <item>225</item>
+        <item>226</item>
+        <item>227</item>
+        <item>228</item>
+        <item>229</item>
+        <item>230</item>
+        <item>231</item>
+        <item>232</item>
+        <item>233</item>
+        <item>234</item>
+        <item>235</item>
+        <item>236</item>
+        <item>237</item>
+        <item>238</item>
+        <item>239</item>
+        <item>240</item>
+        <item>241</item>
+        <item>242</item>
+        <item>243</item>
+        <item>244</item>
+        <item>245</item>
+        <item>246</item>
+        <item>247</item>
+        <item>248</item>
+        <item>249</item>
+        <item>250</item>
+        <item>251</item>
+        <item>252</item>
+        <item>253</item>
+        <item>254</item>
         <item>255</item>
     </integer-array>
 
+    <!-- An array of floats describing the screen brightness in nits corresponding to the backlight
+         values in the config_screenBrightnessBacklight array.  On OLED displays these  values
+         should be measured with an all white image while the display is in the fully on state.
+         Note that this value should *not* reflect the maximum brightness value for any high
+         brightness modes but only the maximum brightness value obtainable in a sustainable manner.
+         This array should be equal in size to config_screenBrightnessBacklight -->
+    <array name="config_screenBrightnessNits">
+        <item>2.2</item>
+        <item>3.7</item>
+        <item>5.34</item>
+        <item>6.98</item>
+        <item>8.63</item>
+        <item>10.27</item>
+        <item>11.91</item>
+        <item>13.55</item>
+        <item>15.2</item>
+        <item>16.84</item>
+        <item>18.48</item>
+        <item>20.12</item>
+        <item>21.76</item>
+        <item>23.41</item>
+        <item>25.05</item>
+        <item>26.69</item>
+        <item>28.33</item>
+        <item>29.98</item>
+        <item>31.62</item>
+        <item>33.26</item>
+        <item>34.9</item>
+        <item>36.54</item>
+        <item>38.19</item>
+        <item>39.83</item>
+        <item>41.47</item>
+        <item>43.11</item>
+        <item>44.76</item>
+        <item>46.4</item>
+        <item>48.04</item>
+        <item>49.68</item>
+        <item>51.32</item>
+        <item>52.97</item>
+        <item>54.61</item>
+        <item>56.25</item>
+        <item>57.89</item>
+        <item>59.54</item>
+        <item>61.18</item>
+        <item>62.82</item>
+        <item>64.46</item>
+        <item>66.1</item>
+        <item>67.75</item>
+        <item>69.39</item>
+        <item>71.03</item>
+        <item>72.67</item>
+        <item>74.32</item>
+        <item>75.96</item>
+        <item>77.6</item>
+        <item>79.24</item>
+        <item>80.88</item>
+        <item>82.53</item>
+        <item>84.17</item>
+        <item>85.81</item>
+        <item>87.45</item>
+        <item>89.1</item>
+        <item>90.74</item>
+        <item>92.38</item>
+        <item>94.02</item>
+        <item>95.66</item>
+        <item>97.31</item>
+        <item>98.95</item>
+        <item>100.59</item>
+        <item>102.23</item>
+        <item>103.88</item>
+        <item>105.52</item>
+        <item>107.16</item>
+        <item>108.8</item>
+        <item>110.44</item>
+        <item>112.09</item>
+        <item>113.73</item>
+        <item>115.37</item>
+        <item>117.01</item>
+        <item>118.66</item>
+        <item>120.3</item>
+        <item>121.94</item>
+        <item>123.58</item>
+        <item>125.22</item>
+        <item>126.87</item>
+        <item>128.51</item>
+        <item>130.15</item>
+        <item>131.79</item>
+        <item>133.44</item>
+        <item>135.08</item>
+        <item>136.72</item>
+        <item>138.36</item>
+        <item>140</item>
+        <item>142.06</item>
+        <item>143.7</item>
+        <item>145.34</item>
+        <item>146.98</item>
+        <item>148.63</item>
+        <item>150.27</item>
+        <item>151.91</item>
+        <item>153.55</item>
+        <item>155.2</item>
+        <item>156.84</item>
+        <item>158.48</item>
+        <item>160.12</item>
+        <item>161.76</item>
+        <item>163.41</item>
+        <item>165.05</item>
+        <item>166.69</item>
+        <item>168.33</item>
+        <item>169.98</item>
+        <item>171.62</item>
+        <item>173.26</item>
+        <item>174.9</item>
+        <item>176.54</item>
+        <item>178.19</item>
+        <item>179.83</item>
+        <item>181.47</item>
+        <item>183.11</item>
+        <item>184.76</item>
+        <item>186.4</item>
+        <item>188.04</item>
+        <item>189.68</item>
+        <item>191.32</item>
+        <item>192.97</item>
+        <item>194.61</item>
+        <item>196.25</item>
+        <item>197.89</item>
+        <item>199.54</item>
+        <item>201.18</item>
+        <item>202.82</item>
+        <item>204.46</item>
+        <item>206.1</item>
+        <item>207.75</item>
+        <item>209.39</item>
+        <item>211.03</item>
+        <item>212.67</item>
+        <item>214.32</item>
+        <item>215.96</item>
+        <item>217.6</item>
+        <item>219.24</item>
+        <item>220.88</item>
+        <item>222.53</item>
+        <item>224.17</item>
+        <item>225.81</item>
+        <item>227.45</item>
+        <item>229.1</item>
+        <item>230.74</item>
+        <item>232.38</item>
+        <item>234.02</item>
+        <item>235.66</item>
+        <item>237.31</item>
+        <item>238.95</item>
+        <item>240.59</item>
+        <item>242.23</item>
+        <item>243.88</item>
+        <item>245.52</item>
+        <item>247.16</item>
+        <item>248.8</item>
+        <item>250.44</item>
+        <item>252.09</item>
+        <item>253.73</item>
+        <item>255.37</item>
+        <item>257.01</item>
+        <item>258.66</item>
+        <item>260.3</item>
+        <item>261.94</item>
+        <item>263.58</item>
+        <item>265.22</item>
+        <item>266.87</item>
+        <item>268.51</item>
+        <item>270.15</item>
+        <item>271.79</item>
+        <item>273.44</item>
+        <item>275.08</item>
+        <item>276.72</item>
+        <item>278.36</item>
+        <item>280</item>
+        <item>282.06</item>
+        <item>283.7</item>
+        <item>285.34</item>
+        <item>286.98</item>
+        <item>288.63</item>
+        <item>290.27</item>
+        <item>291.91</item>
+        <item>293.55</item>
+        <item>295.2</item>
+        <item>296.84</item>
+        <item>298.48</item>
+        <item>300.12</item>
+        <item>301.76</item>
+        <item>303.41</item>
+        <item>305.05</item>
+        <item>306.69</item>
+        <item>308.33</item>
+        <item>309.98</item>
+        <item>311.62</item>
+        <item>313.26</item>
+        <item>314.9</item>
+        <item>316.54</item>
+        <item>318.19</item>
+        <item>319.83</item>
+        <item>321.47</item>
+        <item>323.11</item>
+        <item>324.76</item>
+        <item>326.4</item>
+        <item>328.04</item>
+        <item>329.68</item>
+        <item>331.32</item>
+        <item>332.97</item>
+        <item>334.61</item>
+        <item>336.25</item>
+        <item>337.89</item>
+        <item>339.54</item>
+        <item>341.18</item>
+        <item>342.82</item>
+        <item>344.46</item>
+        <item>346.1</item>
+        <item>347.75</item>
+        <item>349.39</item>
+        <item>351.03</item>
+        <item>352.67</item>
+        <item>354.32</item>
+        <item>355.96</item>
+        <item>357.6</item>
+        <item>359.24</item>
+        <item>360.88</item>
+        <item>362.53</item>
+        <item>364.17</item>
+        <item>365.81</item>
+        <item>367.45</item>
+        <item>369.1</item>
+        <item>370.74</item>
+        <item>372.38</item>
+        <item>374.02</item>
+        <item>375.66</item>
+        <item>377.31</item>
+        <item>378.95</item>
+        <item>380.59</item>
+        <item>382.23</item>
+        <item>383.88</item>
+        <item>385.52</item>
+        <item>387.16</item>
+        <item>388.8</item>
+        <item>390.44</item>
+        <item>392.09</item>
+        <item>393.73</item>
+        <item>395.37</item>
+        <item>397.01</item>
+        <item>398.66</item>
+        <item>400.3</item>
+        <item>401.94</item>
+        <item>403.58</item>
+        <item>405.22</item>
+        <item>406.87</item>
+        <item>408.51</item>
+        <item>410.15</item>
+        <item>411.79</item>
+        <item>413.44</item>
+        <item>415.08</item>
+        <item>416.72</item>
+        <item>418.36</item>
+        <item>420</item>
+    </array>
+
     <!-- MMS user agent string -->
     <string name="config_mms_user_agent" translatable="false">Android-Mms/2.0</string>
 
@@ -215,7 +768,7 @@
 
     <!-- If true, the doze component is not started until after the screen has been
          turned off and the screen off animation has been performed. -->
-    <bool name="config_dozeAfterScreenOff">true</bool>
+    <bool name="config_dozeAfterScreenOffByDefault">true</bool>
 
     <!-- Screen brightness used to dim the screen while dozing in a very low power state.
          May be less than the minimum allowed brightness setting
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 376c35b647c4c9b50078c5fc2733e9d3a61abb98..356a50e8ed026b433088755d57b2f5f02631987a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1102,6 +1102,11 @@ vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.soter@1.0.so
 
+# Tct Daemon
+vendor/bin/tctd
+vendor/etc/init/tctd.rc
+vendor/lib/libQSEEComAPI.so
+
 # Thermal engine
 vendor/bin/thermal-engine
 vendor/etc/init/init_thermal-engine.rc
diff --git a/sepolicy/vendor/bt-mac.te b/sepolicy/vendor/bt-mac.te
deleted file mode 100644
index bbbb4c4258122cbe5e04794f13aa7b1f0909f8cb..0000000000000000000000000000000000000000
--- a/sepolicy/vendor/bt-mac.te
+++ /dev/null
@@ -1,10 +0,0 @@
-type bluetooth-mac, domain;
-type bluetooth-mac_exec, exec_type, vendor_file_type, file_type;
-init_daemon_domain(bluetooth-mac);
-
-allow bluetooth-mac vendor_toolbox_exec:file rx_file_perms;
-
-allow bluetooth-mac mnt_vendor_file:dir search;
-r_dir_file(bluetooth-mac, persist_t2m_param_file)
-
-set_prop(bluetooth-mac, vendor_bluetooth_prop)
diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te
index e17873386cc55b735ecbcc1aa3db09048e05aa25..59f4c5d03cb908f41720b58ddbc6cb82586f59ba 100644
--- a/sepolicy/vendor/device.te
+++ b/sepolicy/vendor/device.te
@@ -1,2 +1,3 @@
 type fpsensor_fp_device, dev_type;
+type traceability_block_device, dev_type;
 type vl53l1_device, dev_type;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index e36e8c46ac8b72874ff37c6cbabff4fe3afb75fb..136f7273923d4b5049f8e641e39a00d64c7d1dcb 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -7,12 +7,8 @@
 /dev/fpsensor                                                              u:object_r:fpsensor_fp_device:s0
 
 # MAC (Bluetooth)
-/vendor/bin/bluetooth-mac_FP4                                              u:object_r:bluetooth-mac_exec:s0
 /mnt/vendor/persist/t2m_param(/.*)?                                        u:object_r:persist_t2m_param_file:s0
 
-# Modem
-/dev/block/platform/soc/1d84000.ufshc/by-name/tunning                      u:object_r:vendor_modem_efs_partition_device:s0
-
 # NFC
 /dev/st21nfc                                                               u:object_r:nfc_device:s0
 /vendor/bin/hw/android\.hardware\.nfc@1\.2-service.st                      u:object_r:hal_nfc_default_exec:s0
@@ -42,6 +38,13 @@
 /sys/devices/virtual/misc/msm_wma/wakeup[0-9]+(/.*)?                       u:object_r:sysfs_wakeup:s0
 /sys/devices/virtual/misc/msm_wmapro/wakeup[0-9]+(/.*)?                    u:object_r:sysfs_wakeup:s0
 
+# Partitions
+/dev/block/platform/soc/1d84000.ufshc/by-name/tunning                      u:object_r:vendor_modem_efs_partition_device:s0
+/dev/block/platform/soc/1d84000.ufshc/by-name/traceability                 u:object_r:traceability_block_device:s0
+
+# Tct Daemon
+/vendor/bin/tctd                                                           u:object_r:tctd_exec:s0
+
 # Vibrator
 /vendor/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.FP4               u:object_r:hal_vibrator_default_exec:s0
 
diff --git a/sepolicy/vendor/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te
index 8f2a507834d4d128828ea4eb633c54be0d493b6d..5064c42f191af8a10a7d45541eb1aae50c65ffbf 100644
--- a/sepolicy/vendor/hal_sensors_default.te
+++ b/sepolicy/vendor/hal_sensors_default.te
@@ -1 +1,2 @@
 allow hal_sensors_default sysfs_leds:file r_file_perms;
+get_prop(hal_sensors_default, vendor_tct_default_prop)
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index ddd57dcadb363547a608032cd6554831fa7fcfb5..c81b85f5df9b1b9da49c50ff8fd012e035933d8b 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -1 +1,2 @@
 type vendor_t2m_sys_prop, property_type;
+type vendor_tct_default_prop, property_type;
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 0e67403c0769529cff38c5e05c4bca8a13ddf357..132ae19d06814c1b2feb7cbb2355541b8234b51a 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,5 +1,12 @@
 # A2DP
-persist.vendor.bluetooth.a2dp.  u:object_r:vendor_bluetooth_prop:s0
+persist.vendor.bluetooth.a2dp. u:object_r:vendor_bluetooth_prop:s0
+
+# Bluetooth MAC
+ro.vendor.t2m.btmac            u:object_r:vendor_t2m_sys_prop:s0
+
+# Light Sensor Calibration
+ro.vendor.tct.backcaldata      u:object_r:vendor_tct_default_prop:s0
+ro.vendor.tct.frontcaldata     u:object_r:vendor_tct_default_prop:s0
 
 # Serial Nums
 vendor.t2m.camera_main.sn      u:object_r:vendor_t2m_sys_prop:s0
diff --git a/sepolicy/vendor/tctd.te b/sepolicy/vendor/tctd.te
new file mode 100644
index 0000000000000000000000000000000000000000..e34a0c356ea146528731a79a7c84176f3635b565
--- /dev/null
+++ b/sepolicy/vendor/tctd.te
@@ -0,0 +1,16 @@
+type tctd, domain;
+type tctd_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(tctd);
+
+# Traceability
+allow tctd block_device:dir search;
+allow tctd traceability_block_device:blk_file rw_file_perms;
+
+# Bluetooth MAC
+allow tctd mnt_vendor_file:dir search;
+r_dir_file(tctd, persist_t2m_param_file)
+
+set_prop(tctd, vendor_t2m_sys_prop)
+
+# Light Sensor Calibration
+set_prop(tctd, vendor_tct_default_prop)
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
new file mode 100644
index 0000000000000000000000000000000000000000..714f523192300ab99d77a2c23e0e738d13fcf7ea
--- /dev/null
+++ b/sepolicy/vendor/vendor_init.te
@@ -0,0 +1 @@
+get_prop(vendor_init, vendor_t2m_sys_prop)