Merge "Added CTS test cases for getNetworkId() and getSystemId()"