[automerger skipped] Merge "Add a hidden API for EXTRA_LAST_KNOWN_NETWORK_COUNTRY" am: 954f3d780f am: f62fb887bd -s ours am: fcf2a6b6ea -s ours

am skip reason: Change-Id Id77b81e18b293d8d8c8e7b3127826fbd577d6117 with SHA-1 8d1791efc7 is in history

Change-Id: I3a0cb5abb94265c7516f5290132113e89fc86ca8