am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"

* commit '840f114395652b3d31815ae23302218305b8b780':
  Fix wrong log information in DevicePolicyManagerService