Merge "Adds a filtering bitmask to DownloadStateCallback"
am: 177bd65211

Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e