Merge "Correctly restore country code info for connected BT device." am: 3c0e87fe am: a6017848

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



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