Snap for 10453563 from bee1c61bcc963e883cbdae3badcf874bbd36d2d8 to mainline-adservices-release

Change-Id: Iddd105f4acc222d389552b39a41a99f62d668f5a