Merge "Snap for 5616525 from 08bc827b428b81ce79c3592a9bd8cd1edc36e78b to androidx-loader-release" into androidx-loader-release