Merge "Tuner: Allow lockscreen launch targets to be customized"

diff --cc packages/SystemUI/res/values/strings.xml
Simple merge

diff --cc packages/SystemUI/res/xml/tuner_prefs.xml
index 3c6315b,5afab7b..94a7c07
--- 1/packages/SystemUI/res/xml/tuner_prefs.xml
--- 2/packages/SystemUI/res/xml/tuner_prefs.xml
+++ b/packages/SystemUI/res/xml/tuner_prefs.xml
@@@ -154,8 -155,14 +154,13 @@@
          android:key="nav_bar"
          android:title="@string/nav_bar"
          android:fragment="com.android.systemui.tuner.NavBarTuner" />
 -    -->
  
      <Preference
+             android:key="lockscreen"
+             android:title="@string/accessibility_desc_lock_screen"
+             android:fragment="com.android.systemui.tuner.LockscreenFragment" />
+ 
+     <Preference
              android:key="other"
              android:title="@string/other"
              android:fragment="com.android.systemui.tuner.OtherPrefs" />