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

Change-Id: I10f03c44975e813d9069ee05c613b0ca6a7c0ef7