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

Change-Id: I52eb934c9d651b331bc8a854a3e95cfdd265a7da