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

Change-Id: I450e1edba62e39d972dd87fd3fed9d359919b3a8