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

Change-Id: Icd170f2f4658fe6a6dbc146b13b11b3bbc26060e