Merge "Added owners for DevicePolicy mocking tests"