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

Change-Id: I3ef8f3f6feacda1f764ec0694dd8baffc17c22dc