Merge "Fix DevicePolicyManager javadoc" into lmp-dev