Merge "Snap for 7931906 from a77d142ee0f3a7849e63ef368ed1f4c5a01e5e63 to androidx-annotation-annotation-experimental-release" into androidx-annotation-annotation-experimental-release