Merge "Device Admin CTS Verifier Tests" into gingerbread