Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev

package com.android.server;

import android.Manifest;

import android.app.ActivityManager;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Binder;

import android.os.UserHandle;

import android.service.persistentdata.IPersistentDataBlockService;

import android.util.Slog;

import com.android.internal.R;

import libcore.io.IoUtils;

import java.io.DataInputStream;

        @Override

        public void setOemUnlockEnabled(boolean enabled) {

            // do not allow monkey to flip the flag

            if (ActivityManager.isUserAMonkey()) {

                return;

            }

            enforceOemUnlockPermission();

            FileOutputStream outputStream;

            try {