Merge "Adds DownloadStateCallback test to EMBMS Download TestApp" into oc-mr1-dev
am: 1929120ad3  -s ours

Change-Id: I5633830d629fe69dc08d5a846f2b4818e503cfd4