Merge "Fix CTS breakage for CtsDevicePolicyTestCases." into main