Merge "Merge cherrypicks of [1051573] into androidx-fragment-release" into androidx-fragment-release