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

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

src/com/android/settings/MasterClearConfirm.java

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