Merge "Add a hidden API for EXTRA_LAST_KNOWN_NETWORK_COUNTRY" am: 954f3d780f

Change-Id: I56ea369f40a010eaf79ee7041df91d2aa77f2e3c