Merge "Merge cherrypicks of [986763] into androidx-core-release" into androidx-core-release