Merge "Fix mockito that fail to stub a second time" am: d47dd0c2 am: b4c331bd

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



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