Merge "Use getSelectedSatelliteSubId() instead of getSatellitePhone().getSubId()" into main