am ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev

* commit 'ff150032e3c369513b0ba85b09aff1d8933c7ad3':
  Don't wipe PST partition if OEM unlock is enabled

src/com/android/settings/MasterClearConfirm.java

@@ -65,8 +65,11 @@ public class MasterClearConfirm extends Fragment {
                     getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
 
             if (pdbManager != null) {
+                // if OEM unlock is enabled, this will be wiped during FR process.
+                if (!pdbManager.getOemUnlockEnabled()) {
                     pdbManager.wipe();
                 }
+            }
 
             if (mEraseSdCard) {
                 Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET);