Merge " SettingLib: Fix possible issue on bonding to second device" into...

Merge " SettingLib: Fix possible issue on bonding to second device" into tm-qpr-dev am: 7723413b am: 1b689891

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20833220



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