Merge "Fixes to DeviceAdmin & DevicePolicyManager Javadoc"