TBR Syncbase discovery: Preserve adIds across advertisements.

This is important to prevent trampling in the discovery state maintained
by syncbase's scan.

MultiPart: 1/2
Change-Id: Ic0134450b04dbe5374328ac8c328a7faca1dc06b
2 files changed