Merge "register intent receiver for country change" into udc-dev am: c2bb5085 am: d0e43388

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21527251



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