Snap for 10754184 from b3bb0538a75897a45874524d0a308cdc6bd0e324 to mainline-adservices-release

Change-Id: Id35009034daa425d6777b5cbc8ab28ade6adb92f