Merge "Fix "Factory Reset" fails to reset the device" into tm-dev

import android.graphics.Color;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.service.oemlock.OemLockManager;

public class MainClearConfirm extends InstrumentedFragment {

    private static final String TAG = "MainClearConfirm";

    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";

    @VisibleForTesting View mContentView;

    private boolean mEraseSdCard;

    @VisibleForTesting boolean mEraseEsims;

                return;

            }

            // pre-flight check hardware support PersistentDataBlockManager

            if (SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("")) {

                return;

            }

            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);