[automerger skipped] Merge "Handle missing variables when...

[automerger skipped] Merge "Handle missing variables when ActiveDeviceManager.clear()" into tm-qpr-dev am: 3e722720 -s ours

am skip reason: Merged-In I235e39b23b950e007e8fdb1b9f6c4ea0eb0fda3c with SHA-1 10b45563 is already in history

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



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