Merge "Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b am: 94cd5b22c1 am: b77581725f" into oc-mr1-dev-plus-aosp
am: 0374973a74

Change-Id: I862b5e5048c225f84494b8329f3b85fbaa754c20