Snap for 10453563 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-adservices-release Change-Id: I563320c37375ac00c2e9090d47253dac00aebdec