Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" am: b7cbb2fe49 am: 5d0f5f46ef am: 915c02c96a
am: cc1916b54b

Change-Id: I343937d76693e62a47ece76b2b3c980e485803fd