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