Merge "Reactivate backup service after device owner is cleared."

                mDeviceOwner.clearDeviceOwner();

                mDeviceOwner.writeOwnerFile();

                updateDeviceOwnerLocked();

                // Reactivate backup service.

                long ident = Binder.clearCallingIdentity();

                try {

                    IBackupManager ibm = IBackupManager.Stub.asInterface(

                            ServiceManager.getService(Context.BACKUP_SERVICE));

                    ibm.setBackupServiceActive(UserHandle.USER_OWNER, true);

                } catch (RemoteException e) {

                    throw new IllegalStateException("Failed reactivating backup service.", e);

                } finally {

                    Binder.restoreCallingIdentity(ident);

                }

            }

        }

    }