Merge changes Ifecc9cf5,I09d6ce2c

* changes:
  Renamed WmServiceUtils.java to TestSystemServices.java
  Remove createActivityTaskManagerService and setupActivityTaskManagerService