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

Merge "Correctly restore country code info for connected BT device." am: 3c0e87fe am: a6017848 am: 080676a7 am: 2cb5d092 am: af8ad3e6

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



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