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

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



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