Merge "Flag to avoid immediately removing device properties for temporary...

Merge "Flag to avoid immediately removing device properties for temporary pairing" into main am: 4ec78c6f am: bb49decf

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



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