Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
am: 9bdf289f0a

* commit '9bdf289f0a1874d151684497cb3acd8f96fbd58d':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: I50f93b3e867140199f1de253f283c220c1df211e