Merge "Snap for 11608593 from a70ae7a1ba6715ca7a2ec4fd5647934239705fb2 to android12L-tests-release" into android12L-tests-release