Merge "Adds DownloadStateCallback test to EMBMS Download TestApp" am: e4a7a8c5f2 am: 8aaaaf1410
am: ab87889f2d

Change-Id: Ibc9be79c57fefcbcc2de07909a25908053a457a3