Merge changes I0863b40a,I4810f5e3

* changes:
  Add metrics for DevicePolicyManagerService methods (Part 2)
  Add additional event ids for DevicePolicyEvent atom.