Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" into oc-mr1-dev