Merge "[Invisalign] Fix crash in instrumentation tests" am: bd08758a am: eeca8f3b

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



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