Merge "Snap for 7200618 from a7fc3a849a8563579a2961cd8c9e70cb6bacced8 to android11-tests-release" into android11-tests-release