Merge changes I0f625b36,Idae7d16d

* changes:
  ActivityManagerService: remove synchronization for get/setDeviceOwner
  AppWidgetServiceImpl: add mWidgetPackages lock