Snap for 11174750 from d4acff6182b294718056de99b67128576b2b7f9e to mainline-adservices-release

Change-Id: I2dfd926ac09b571f13de7eb0c583e2d7e3d06ed0