Snap for 8708169 from 631b27bdc4d818f1dfebe66e781bf071c33eaa97 to mainline-go-adservices-release

Change-Id: I08feb0b9bcde9092e20fa43a3289ce41be0373bf