Merge "Bug fixed for CTS failures on CtsDevicePolicyManagerTestCases"