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

Change-Id: I0d1a9f811d3a35dacbc7c8527948da7ab5bde6c2