Merge cherrypicks of ['android-review.googlesource.com/2828143'] into androidx-work-release.

Change-Id: Icd3f0e3a0a3cb80a4dcebfbaa1a9ef2b2985cd87