[automerger skipped] Fix NullPointerException for stopAdvertisingSet() am: 600bfdb0 am: 6efaf8f3 -s ours

am skip reason: Merged-In Ib64ba359ab2b20a16c107e52fd77fbc8bcd3a315 with SHA-1 33a3195a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20613992



Change-Id: I57f0cbc91a313f8367ea480ac22b6dcd0f83552b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>