Merge "Merge "Remove legacy advertiser from map after it's no longer used"...

Merge "Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa0 am: 50bad313" into oc-dr1-dev-plus-aosp
am: c027c017

Change-Id: I70ceaa225a9bcdffed6c7be1977f11795593a7cb