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

Change-Id: I4332a7f839aec731acaafbb9fa6213f2ada39857