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

Change-Id: I9968e0b22512f1a680c3fc3827cfb3c3e0c65df6