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

Change-Id: I9e17124dacc4ad8174356064e5be8bf27b73ea28