Snap for 11174750 from 2d85d484354102e3d7e6f8db3a7b30ff26194bd3 to mainline-adservices-release

Change-Id: Ic7c9177b85a51eccde8db847fe25f0f618a4099f