Merge "Merge cherrypicks of [1126987] into androidx-loader-release" into androidx-loader-release