Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread