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