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

Change-Id: I62511fe824ef96e02c2f186fc2306c1b24dd148e