Merge "Contribute roaming configuration for domestic roaming and non-roaming cases" into lmp-dev