[automerger skipped] Merge "Split the DownloadStateCallback class into two" am: aa8f09d41a
am: b1cb52e1a8  -s ours

Change-Id: I87ed98ccbb62e13bc88f5cfe7e00b15364711969