Merge "Snap for 7277511 from 28528bf3b9c5d0cad9a6021df868617f7d1e8a32 to android11-tests-release" into android11-tests-release