Merge "Fix OnAdvertisingSetStopped callback not being called" am: f9d9bf4199
am: d57765298d

Change-Id: I9dd8cb6c7be6edd89687a9184749ee1aca5bcbca