Merge changes Idccade48,I3213bc92

* changes:
  Move CtsDevicePolicyManagerTestCases to its own group
  Sync TEST_MAPPING files from master branch