am 512016bd: am 91f380a0: Merge "DevicePolicyManager Tests" into gingerbread

* commit '512016bd25b2c95c1528e9e65ac5c5ac16d00981':
  DevicePolicyManager Tests