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

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



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