Snap for 9887711 from ce31f9c2733331100a48d53a7014438b3fcab312 to mainline-adservices-release

Change-Id: I9685480e1fcd4c3de649f63415e4bc4e4ba5efeb