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

Change-Id: I8884321a24a45e5713faa86be2ecd8ccb0a23614