Revert "Revert "Implement country-dependent detection logic""

This reverts commit b0eba0c1.

Reason for revert: The first revert was likely due to a test failure caused by a partial topic.

Bug: 142674063
Bug: 141740972
Bug: 141727033
Change-Id: I1bdfad578a30aa5c1ed69b59eaf63d7769e17501