Merge "Add a hidden API for EXTRA_LAST_KNOWN_NETWORK_COUNTRY" into rvc-dev am: 00813b7648 am: 3d9667ebc4

Change-Id: I2b6ddd0b3b80424d00c307ca8b845fa593db08a5