Merge "Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c am: 526719a1a2" into oc-dev-plus-aosp
am: 28a9a1a61e

Change-Id: I1b3a962d28ff95aaf147afb0032ab7bc6495611b