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

Change-Id: Ibc9a05f73c85b6ea4ef9d851962fe103bc84cb08