Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev am: dbe2815199  -s ours
am: bdfcee88f2  -s ours

Change-Id: I09c0e83f640eb21c9d050118ccb022a0b0b569a0