Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b
am: 94cd5b22c1

Change-Id: Ib20ddd31af4653133646b63c07108bcb924b3569