Snap for 11174750 from 36322e183aca87d4ab80e6a34dfd9be2923d8b29 to mainline-adservices-release

Change-Id: I1769da6888ca1493c8ac5b89e5b02f481c9210f5