Merge "Snap for 15082285 from eb55605084be5b15cf37e7f18000212a80f23316 to androidx-annotation-release" into androidx-annotation-release