Merge "Merge "Add a hidden API for EXTRA_LAST_KNOWN_NETWORK_COUNTRY" into rvc-dev am: 00813b7648 am: 57fa34bd18" into rvc-d1-dev-plus-aosp am: 05f51db753 am: eedf360b25

Change-Id: I778563a5c8b0f2af42d8dfa8e27d81aa74f2aebe