Merge "upgraded devicepolicy tests to use AndroidJUnitRunner"