Merge "Tidy javadoc in DevicePolicyManager" into main