am ef3d85a5: Merge "Fix DevicePolicyManager javadoc" into lmp-dev

* commit 'ef3d85a5d9de21c4569cc1bec4e696bbf44623a6':
  Fix DevicePolicyManager javadoc