Merge "Remove @Deprecated && @removed methods from DevicePolicyManager."