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

Change-Id: Ib44907a0d3e550377a22931fdf66df2731f87468