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

* commit '66ce8faf4cefa5bc9b240c748b60f5eb287f0852':
  Fix DevicePolicyManager javadoc