Merge "Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a am: 67d9f72659" into nyc-mr1-dev-plus-aosp