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