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

Change-Id: I51b3b9d4bc3ff769a11dd62bf4a88922e5e386c7